From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 12 Sep 2011 03:51:12 +0000 (+1000)
Subject: Merge remote-tracking branch 'fbdev/fbdev-next'
X-Git-Tag: next-20110912~36
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=7335861d8b53357a5abe27fd83cd3efb7a8e18cc;p=karo-tx-linux.git

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

7335861d8b53357a5abe27fd83cd3efb7a8e18cc
diff --cc MAINTAINERS
index 5231b8108dbd,988422185e8d..4adc8ca21a37
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -5933,8 -5918,14 +5933,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