Merge Linus' tree to be be to apply submitted patches to newer code than
authorJiri Kosina <jkosina@suse.cz>
Thu, 20 Nov 2014 13:42:02 +0000 (14:42 +0100)
committerJiri Kosina <jkosina@suse.cz>
Thu, 20 Nov 2014 13:42:02 +0000 (14:42 +0100)
current trivial.git base

12 files changed:
1  2 
arch/powerpc/platforms/44x/Kconfig
drivers/clk/Kconfig
drivers/net/ethernet/atheros/atl1c/atl1c_main.c
drivers/pci/pci-driver.c
drivers/pinctrl/spear/pinctrl-plgpio.c
drivers/scsi/mpt2sas/mpt2sas_ctl.h
drivers/usb/gadget/legacy/zero.c
drivers/usb/serial/usb-serial-simple.c
include/scsi/scsi_host.h
kernel/trace/trace.c
mm/zbud.c
mm/zswap.c

index 54835e61997b81d6f8a4aec3a1efaa7026294452,82f2da28cd2775c4051a60d3f4014e25148f892c..d2ac1c1164546c20fe252f3ebe045aa40b84308d
@@@ -215,11 -215,12 +215,11 @@@ config AKEBON
        select NET_VENDOR_IBM
        select IBM_EMAC_EMAC4
        select IBM_EMAC_RGMII_WOL
-       select USB
-       select USB_OHCI_HCD_PLATFORM
-       select USB_EHCI_HCD_PLATFORM
+       select USB if USB_SUPPORT
+       select USB_OHCI_HCD_PLATFORM if USB_OHCI_HCD
+       select USB_EHCI_HCD_PLATFORM if USB_EHCI_HCD
        select MMC_SDHCI
        select MMC_SDHCI_PLTFM
 -      select MMC_SDHCI_OF_476GTR
        select ATA
        select SATA_AHCI_PLATFORM
        help
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc mm/zbud.c
Simple merge
diff --cc mm/zswap.c
Simple merge