Merge Linus' tree to be be to apply submitted patches to newer code than

current trivial.git base

diff --cc arch/powerpc/platforms/44x/Kconfig
index 54835e6,82f2da2..d2ac1c1
--- 1/arch/powerpc/platforms/44x/Kconfig
--- 2/arch/powerpc/platforms/44x/Kconfig
+++ b/arch/powerpc/platforms/44x/Kconfig
@@@ -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

diff --cc drivers/clk/Kconfig
Simple merge

diff --cc drivers/net/ethernet/atheros/atl1c/atl1c_main.c
Simple merge

diff --cc drivers/pci/pci-driver.c
Simple merge

diff --cc drivers/pinctrl/spear/pinctrl-plgpio.c
Simple merge

diff --cc drivers/scsi/mpt2sas/mpt2sas_ctl.h
Simple merge

diff --cc drivers/usb/gadget/legacy/zero.c
Simple merge

diff --cc drivers/usb/serial/usb-serial-simple.c
Simple merge

diff --cc include/scsi/scsi_host.h
Simple merge

diff --cc kernel/trace/trace.c
Simple merge

diff --cc mm/zbud.c
Simple merge

diff --cc mm/zswap.c
Simple merge