Merge current mainline tree into linux-omap tree

Merge branches 'master' and 'linus'

diff --cc Makefile
Simple merge

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

diff --cc drivers/video/omap/Makefile
index 881e87d7f6db9d79454eac3880499c5224d1bd76,ed13889c116223e16f99ec32de9c0c1762e54897..25a47b006fa067c50ed1f6876f50ed2677ae332b
--- 1/drivers/video/omap/Makefile
--- 2/drivers/video/omap/Makefile
+++ b/drivers/video/omap/Makefile
@@@ -26,17 -23,6 +26,16 @@@ objs-y$(CONFIG_MACH_OMAP_PALMZ71) += lc
  objs-$(CONFIG_ARCH_OMAP16XX)$(CONFIG_MACH_OMAP_INNOVATOR) += lcd_inn1610.o
  objs-$(CONFIG_ARCH_OMAP15XX)$(CONFIG_MACH_OMAP_INNOVATOR) += lcd_inn1510.o
  objs-y$(CONFIG_MACH_OMAP_OSK) += lcd_osk.o
- objs-y$(CONFIG_MACH_SX1) += lcd_sx1.o
  
 +objs-y$(CONFIG_MACH_OMAP_APOLLON) += lcd_apollon.o
 +objs-y$(CONFIG_MACH_OMAP_2430SDP) += lcd_2430sdp.o
 +objs-y$(CONFIG_MACH_OMAP_3430SDP) += lcd_2430sdp.o
 +objs-y$(CONFIG_MACH_OMAP_LDP) += lcd_ldp.o
 +objs-y$(CONFIG_MACH_OMAP2EVM) += lcd_omap2evm.o
 +objs-y$(CONFIG_MACH_OMAP3EVM) += lcd_omap3evm.o
 +objs-y$(CONFIG_MACH_OMAP3_BEAGLE) += lcd_omap3beagle.o
 +objs-y$(CONFIG_FB_OMAP_LCD_MIPID) += lcd_mipid.o
 +objs-y$(CONFIG_MACH_OVERO) += lcd_overo.o
 +
  omapfb-objs := $(objs-yy)