broadcom: Fix &&/|| confusion in bcm54xx_adjust_rxrefclk()

[safe/jmp/linux-2.6] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index d7f8668..256139e 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3903,6 +3903,23 @@ L:       linux-omap@vger.kernel.org
 S:     Maintained
 F:     drivers/video/omap/
 
+OMAP DISPLAY SUBSYSTEM SUPPORT (DSS2)
+M:     Tomi Valkeinen <tomi.valkeinen@nokia.com>
+L:     linux-omap@vger.kernel.org
+L:     linux-fbdev@vger.kernel.org (moderated for non-subscribers)
+S:     Maintained
+F:     drivers/video/omap2/dss/
+F:     drivers/video/omap2/vrfb.c
+F:     drivers/video/omap2/vram.c
+F:     Documentation/arm/OMAP/DSS
+
+OMAP FRAMEBUFFER SUPPORT (FOR DSS2)
+M:     Tomi Valkeinen <tomi.valkeinen@nokia.com>
+L:     linux-omap@vger.kernel.org
+L:     linux-fbdev@vger.kernel.org (moderated for non-subscribers)
+S:     Maintained
+F:     drivers/video/omap2/omapfb/
+
 OMAP MMC SUPPORT
 M:     Jarkko Lavinen <jarkko.lavinen@nokia.com>
 L:     linux-omap@vger.kernel.org
@@ -5409,10 +5426,9 @@ S:       Supported
 F:     drivers/block/ub.c
 
 USB CDC ETHERNET DRIVER
-M:     Greg Kroah-Hartman <greg@kroah.com>
+M:     Oliver Neukum <oliver@neukum.name>
 L:     linux-usb@vger.kernel.org
 S:     Maintained
-W:     http://www.kroah.com/linux-usb/
 F:     drivers/net/usb/cdc_*.c
 F:     include/linux/usb/cdc.h
 
@@ -5663,9 +5679,11 @@ S:       Maintained
 F:     drivers/net/wireless/rndis_wlan.c
 
 USB XHCI DRIVER
-M:     Sarah Sharp <sarah.a.sharp@intel.com>
+M:     Sarah Sharp <sarah.a.sharp@linux.intel.com>
 L:     linux-usb@vger.kernel.org
 S:     Supported
+F:     drivers/usb/host/xhci*
+F:     drivers/usb/host/pci-quirks*
 
 USB ZC0301 DRIVER
 M:     Luca Risolia <luca.risolia@studio.unibo.it>
@@ -5941,9 +5959,9 @@ F:        sound/soc/codecs/wm8350.c
 F:     sound/soc/codecs/wm8400.c
 
 X.25 NETWORK LAYER
-M:     Henner Eisen <eis@baty.hanse.de>
+M:     Andrew Hendry <andrew.hendry@gmail.com>
 L:     linux-x25@vger.kernel.org
-S:     Maintained
+S:     Odd Fixes
 F:     Documentation/networking/x25*
 F:     include/net/x25*
 F:     net/x25/