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

Conflicts:
	drivers/video/Kconfig

diff --cc MAINTAINERS
index 0c0c09a414a0d8e82e597e76535ce17decf41edc,988422185e8d0930a4dee9ea98772d073ed374eb..3f45fbe8e61f6b70a5f370f2122f539862e69d3c
--- 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/Kconfig
index 55a7df4ea8dec2aa872939e862ddda3f353fdc03,8165c5577d715c33a04e30b9a10d34a4a21dd93e..d83e967e4e15b6380fa1dc94584aac871b6a4b1d
--- 1/drivers/video/Kconfig
--- 2/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
@@@ -1755,10 -1764,11 +1764,11 @@@ config FB_AU110
  
  config FB_AU1200
        bool "Au1200 LCD Driver"
 -      depends on (FB = y) && MIPS && SOC_AU1200
 +      depends on (FB = y) && MIPS_ALCHEMY
-       select FB_CFB_FILLRECT
-       select FB_CFB_COPYAREA
-       select FB_CFB_IMAGEBLIT
+       select FB_SYS_FILLRECT
+       select FB_SYS_COPYAREA
+       select FB_SYS_IMAGEBLIT
+       select FB_SYS_FOPS
        help
          This is the framebuffer driver for the AMD Au1200 SOC.  It can drive
          various panels and CRTs by passing in kernel cmd line option

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

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