Merge branch 'omap-upstream' into for-next

Conflicts:
	arch/arm/mach-omap2/Makefile

diff --cc arch/arm/mach-omap2/Makefile
index 3935a359e7e995ff736f3b44ccc2e728a6f48933,e4f6f61c40e7342b5ee0754cc1f47751b0af6cf1..516477ee56902361be0d88fa06c015d9725963cb
--- 1/arch/arm/mach-omap2/Makefile
--- 2/arch/arm/mach-omap2/Makefile
+++ b/arch/arm/mach-omap2/Makefile
@@@ -57,4 -55,12 +57,10 @@@ obj-$(CONFIG_MACH_NOKIA_RX51)               += board
                                           mmc-twl4030.o
  
  # Platform specific device init code
 -ifeq ($(CONFIG_USB_MUSB_SOC),y)
  obj-y                                 += usb-musb.o
 -endif
+ 
+ onenand-$(CONFIG_MTD_ONENAND_OMAP2)   := gpmc-onenand.o
+ obj-y                                 += $(onenand-m) $(onenand-y)
+ 
+ smc91x-$(CONFIG_SMC91X)                       := gpmc-smc91x.o
+ obj-y                                 += $(smc91x-m) $(smc91x-y)

diff --cc arch/arm/plat-omap/sram.c
Simple merge