Merge current mainline tree into linux-omap tree

Merge branches 'master' and 'linus'

Conflicts:

	arch/arm/Kconfig
	arch/arm/kernel/asm-offsets.c
	arch/arm/mach-omap2/Makefile
	arch/arm/mach-omap2/board-2430sdp.c
	arch/arm/mach-omap2/board-apollon.c
	arch/arm/mach-omap2/board-h4.c
	arch/arm/mach-omap2/clock.c
	arch/arm/mach-omap2/clock.h
	arch/arm/mach-omap2/clock24xx.c
	arch/arm/mach-omap2/clock24xx.h
	arch/arm/mach-omap2/clock34xx.c
	arch/arm/mach-omap2/clock34xx.h
	arch/arm/mach-omap2/cm-regbits-34xx.h
	arch/arm/mach-omap2/cm.h
	arch/arm/mach-omap2/gpmc.c
	arch/arm/mach-omap2/mux.c
	arch/arm/mach-omap2/pm.c
	arch/arm/mach-omap2/prcm.c
	arch/arm/mach-omap2/prm.h
	arch/arm/mach-omap2/sdrc.h
	arch/arm/mach-omap2/sleep.S
	arch/arm/mach-omap2/sram-fn.S
	arch/arm/mm/Kconfig
	arch/arm/plat-omap/clock.c
	drivers/mmc/host/omap.c
	include/asm-arm/arch-omap/clock.h
	include/asm-arm/arch-omap/mmc.h
	include/asm-arm/arch-omap/mux.h
	include/asm-arm/glue.h
	include/asm-arm/thread_info.h

diff --cc MAINTAINERS
Simple merge

diff --cc Makefile
Simple merge

diff --cc arch/arm/Kconfig
index f8a7d222f995e4654ead5ab79417edbebd3f0f1e,d8d253285a94a33c8cc80607b8e811403563e78b..c60a27dd7653af4fc915bb6d42ff9172fc5ee90d
--- 1/arch/arm/Kconfig
--- 2/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@ -1175,11 -1192,8 +1192,13 @@@ source "drivers/dma/Kconfig
  
  source "drivers/dca/Kconfig"
  
+ source "drivers/uio/Kconfig"
+ 
 +if ARCH_OMAP
 +source "drivers/cbus/Kconfig"
 +source "drivers/dsp/dspgateway/Kconfig"
 +endif
 +
  endmenu
  
  source "fs/Kconfig"

diff --cc arch/arm/Makefile
Simple merge

diff --cc arch/arm/mm/Kconfig
index 1626f5c170bf639e28cf6857ee935656203af92e,746cbb7c8e95a7273dc899e811a81cd55d960a3b..15066c29a8498197777139a85aee056c6ce675e6
--- 1/arch/arm/mm/Kconfig
--- 2/arch/arm/mm/Kconfig
+++ b/arch/arm/mm/Kconfig
@@@ -408,7 -409,7 +409,7 @@@ config CPU_32v6
  # ARMv7
  config CPU_V7
        bool "Support ARM V7 processor"
-       depends on ARCH_INTEGRATOR || ARCH_OMAP3
 -      depends on ARCH_INTEGRATOR || MACH_REALVIEW_EB
++      depends on ARCH_INTEGRATOR || MACH_REALVIEW_EB || ARCH_OMAP3
        select CPU_32v6K
        select CPU_32v7
        select CPU_ABRT_EV7

diff --cc drivers/char/hw_random/omap-rng.c
Simple merge

diff --cc drivers/crypto/Kconfig
Simple merge

diff --cc drivers/input/keyboard/Kconfig
Simple merge

diff --cc drivers/input/keyboard/Makefile
Simple merge

diff --cc drivers/leds/Kconfig
Simple merge

diff --cc drivers/leds/Makefile
Simple merge

diff --cc drivers/misc/Kconfig
Simple merge

diff --cc drivers/misc/Makefile
Simple merge

diff --cc drivers/mtd/nand/Kconfig
Simple merge

diff --cc drivers/net/smc91x.c
Simple merge

diff --cc drivers/serial/8250.c
Simple merge

diff --cc drivers/usb/gadget/Kconfig
Simple merge

diff --cc drivers/usb/host/ehci-hcd.c
Simple merge

diff --cc include/asm-arm/cpu-multi32.h
Simple merge

diff --cc net/ipv4/netfilter/Kconfig
Simple merge

diff --cc net/ipv4/netfilter/Makefile
Simple merge

diff --cc security/Kconfig
Simple merge