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

diff --cc MAINTAINERS
index 6357b2af62829f88670c3390aa061a7a05ee0b7b,988422185e8d0930a4dee9ea98772d073ed374eb..c09836a08f3f746ed280806089bb9cd850fade42
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -5947,8 -5918,14 +5947,14 @@@ SMSC9420 PCI ETHERNET DRIVE
  M:    Steve Glendinning <steve.glendinning@smsc.com>
  L:    netdev@vger.kernel.org
  S:    Supported
 -F:    drivers/net/smsc9420.*
 +F:    drivers/net/ethernet/smsc/smsc9420.*
  
+ SMSC UFX6000 and UFX7000 USB to VGA DRIVER
+ M:    Steve Glendinning <steve.glendinning@smsc.com>
+ L:    linux-fbdev@vger.kernel.org
+ S:    Supported
+ F:    drivers/video/smscufx.c
+ 
  SN-IA64 (Itanium) SUB-PLATFORM
  M:    Jes Sorensen <jes@sgi.com>
  L:    linux-altix@sgi.com

diff --cc arch/arm/mach-shmobile/board-mackerel.c
Simple merge

diff --cc drivers/video/atmel_lcdfb.c
Simple merge

diff --cc drivers/video/backlight/adp8870_bl.c
Simple merge