Merge remote-tracking branch 'tty/tty-next'

Conflicts:
	drivers/dma/Kconfig

diff --cc arch/x86/kernel/early_printk.c
Simple merge

diff --cc drivers/dma/Kconfig
index 38ece743f61d15036f1625558878911c3cc7a3d1,074ffad334a70bcf444974b4f7c2225666f31d2b..fd7ac13f2574ab0aab2ecf0c5f6b38019459da99
--- 1/drivers/dma/Kconfig
--- 2/drivers/dma/Kconfig
+++ b/drivers/dma/Kconfig
@@@ -112,17 -125,8 +112,19 @@@ config FSL_DM
          EloPlus is on mpc85xx and mpc86xx and Pxxx parts, and the Elo3 is on
          some Txxx and Bxxx parts.
  
 +config FSL_RAID
 +        tristate "Freescale RAID engine Support"
 +        depends on FSL_SOC && !ASYNC_TX_ENABLE_CHANNEL_SWITCH
 +        select DMA_ENGINE
 +        select DMA_ENGINE_RAID
 +        ---help---
 +          Enable support for Freescale RAID Engine. RAID Engine is
 +          available on some QorIQ SoCs (like P5020/P5040). It has
 +          the capability to offload memcpy, xor and pq computation
 +        for raid5/6.
 +
+ source "drivers/dma/hsu/Kconfig"
+ 
  config MPC512X_DMA
        tristate "Freescale MPC512x built-in DMA engine support"
        depends on PPC_MPC512x || PPC_MPC831x

diff --cc drivers/dma/Makefile
Simple merge

diff --cc include/asm-generic/vmlinux.lds.h
index e874efc3ba7122fcc28de4240893525ef69e1a59,87e5b6f8f4fc742b3d753da2d873e5268aa36515..7b0ef491440d74884fa824d4d8264b326e59cfcc
--- 1/include/asm-generic/vmlinux.lds.h
--- 2/include/asm-generic/vmlinux.lds.h
+++ b/include/asm-generic/vmlinux.lds.h
@@@ -502,9 -509,9 +510,10 @@@
        CLKSRC_OF_TABLES()                                              \
        IOMMU_OF_TABLES()                                               \
        CPU_METHOD_OF_TABLES()                                          \
 +      CPUIDLE_METHOD_OF_TABLES()                                      \
        KERNEL_DTB()                                                    \
        IRQCHIP_OF_MATCH_TABLE()                                        \
+       EARLYCON_TABLE()                                                \
        EARLYCON_OF_TABLES()
  
  #define INIT_TEXT                                                     \

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