From: Linus Torvalds Date: Thu, 2 Dec 2010 20:10:56 +0000 (-0800) Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland... X-Git-Tag: v2.6.37-rc5~33 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=75318ec3277d1fc46ecc129d7ef880b269fd9ee0;hp=-c;p=karo-tx-linux.git Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband: IB: Fix information leak in marshalling code IB/pack: Remove some unused code added by the IBoE patches IB/mlx4: Fix IBoE link state IB/mlx4: Fix IBoE reported link rate mlx4_core: Workaround firmware bug in query dev cap IB/mlx4: Fix memory ordering of VLAN insertion control bits MAINTAINERS: Update NetEffect entry --- 75318ec3277d1fc46ecc129d7ef880b269fd9ee0 diff --combined MAINTAINERS index 3eafe9ee086e,e067aa959d47..74b8e050bf74 --- a/MAINTAINERS +++ b/MAINTAINERS @@@ -161,7 -161,7 +161,7 @@@ M: Greg Kroah-Hartman M: Michael Hanselmann S: Supported -F: drivers/hwmon/ams/ +F: drivers/macintosh/ams/ AMSO1100 RNIC DRIVER M: Tom Tucker @@@ -945,7 -945,7 +945,7 @@@ M: Magnus Damm -L: bonding-devel@lists.sourceforge.net +L: netdev@vger.kernel.org W: http://sourceforge.net/projects/bonding/ S: Supported F: drivers/net/bonding/ @@@ -1391,14 -1391,6 +1391,14 @@@ L: netdev@vger.kernel.or S: Supported F: drivers/net/tg3.* +BROADCOM BRCM80211 IEEE802.11n WIRELESS DRIVER +M: Brett Rudley +M: Henry Ptasinski +M: Nohee Ko +L: linux-wireless@vger.kernel.org +S: Supported +F: drivers/staging/brcm80211/ + BROCADE BFA FC SCSI DRIVER M: Jing Huang L: linux-scsi@vger.kernel.org @@@ -1613,7 -1605,7 +1613,7 @@@ F: drivers/platform/x86/classmate-lapto COCCINELLE/Semantic Patches (SmPL) M: Julia Lawall M: Gilles Muller -M: Nicolas Palix +M: Nicolas Palix L: cocci@diku.dk (moderated for non-subscribers) W: http://coccinelle.lip6.fr/ S: Supported @@@ -1757,7 -1749,6 +1757,7 @@@ L: linux-cris-kernel@axis.co W: http://developer.axis.com S: Maintained F: arch/cris/ +F: drivers/serial/crisv10.* CRYPTO API M: Herbert Xu @@@ -1829,13 -1820,6 +1829,13 @@@ W: http://www.chelsio.co S: Supported F: drivers/net/cxgb4vf/ +STMMAC ETHERNET DRIVER +M: Giuseppe Cavallaro +L: netdev@vger.kernel.org +W: http://www.stlinux.com +S: Supported +F: drivers/net/stmmac/ + CYBERPRO FB DRIVER M: Russell King L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) @@@ -2015,7 -1999,6 +2015,7 @@@ F: drivers/hwmon/dme1737. DOCBOOK FOR DOCUMENTATION M: Randy Dunlap S: Maintained +F: scripts/kernel-doc DOCKING STATION DRIVER M: Shaohua Li @@@ -2026,7 -2009,6 +2026,7 @@@ F: drivers/acpi/dock. DOCUMENTATION M: Randy Dunlap L: linux-doc@vger.kernel.org +T: quilt oss.oracle.com/~rdunlap/kernel-doc-patches/current/ S: Maintained F: Documentation/ @@@ -2080,7 -2062,7 +2080,7 @@@ F: include/drm INTEL DRM DRIVERS (excluding Poulsbo, Moorestown and derivative chipsets) M: Chris Wilson -L: intel-gfx@lists.freedesktop.org +L: intel-gfx@lists.freedesktop.org (subscribers-only) L: dri-devel@lists.freedesktop.org T: git git://git.kernel.org/pub/scm/linux/kernel/git/ickle/drm-intel.git S: Supported @@@ -2444,12 -2426,9 +2444,12 @@@ F: drivers/net/wan/sdla. FRAMEBUFFER LAYER L: linux-fbdev@vger.kernel.org W: http://linux-fbdev.sourceforge.net/ +Q: http://patchwork.kernel.org/project/linux-fbdev/list/ +T: git git://git.kernel.org/pub/scm/linux/kernel/git/lethal/fbdev-2.6.git S: Orphan F: Documentation/fb/ -F: drivers/video/fb* +F: drivers/video/ +F: include/video/ F: include/linux/fb.h FREESCALE DMA DRIVER @@@ -3404,8 -3383,8 +3404,8 @@@ F: Documentation/kdump KERNEL AUTOMOUNTER (AUTOFS) M: "H. Peter Anvin" L: autofs@linux.kernel.org -S: Odd Fixes -F: fs/autofs/ +S: Obsolete +F: drivers/staging/autofs/ KERNEL AUTOMOUNTER v4 (AUTOFS4) M: Ian Kent @@@ -4064,9 -4043,8 +4064,8 @@@ F: drivers/scsi/NCR_D700. NETEFFECT IWARP RNIC DRIVER (IW_NES) M: Faisal Latif - M: Chien Tung L: linux-rdma@vger.kernel.org - W: http://www.neteffect.com + W: http://www.intel.com/Products/Server/Adapters/Server-Cluster/Server-Cluster-overview.htm S: Supported F: drivers/infiniband/hw/nes/ @@@ -4469,7 -4447,7 +4468,7 @@@ L: platform-driver-x86@vger.kernel.or S: Maintained F: drivers/platform/x86/panasonic-laptop.c -PANASONIC MN10300/AM33 PORT +PANASONIC MN10300/AM33/AM34 PORT M: David Howells M: Koichi Yasutake L: linux-am33-list@redhat.com (moderated for non-subscribers) @@@ -5688,7 -5666,7 +5687,7 @@@ S: Maintaine STAGING SUBSYSTEM M: Greg Kroah-Hartman -T: quilt kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/ +T: git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6.git L: devel@driverdev.osuosl.org S: Maintained F: drivers/staging/ @@@ -5717,7 -5695,7 +5716,7 @@@ M: Paul Mundt @@@ -5924,7 -5900,7 +5923,7 @@@ S: Maintaine TTY LAYER M: Greg Kroah-Hartman S: Maintained -T: quilt kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/ +T: git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6.git F: drivers/char/tty_* F: drivers/serial/serial_core.c F: include/linux/serial_core.h @@@ -6247,7 -6223,7 +6246,7 @@@ USB SUBSYSTE M: Greg Kroah-Hartman L: linux-usb@vger.kernel.org W: http://www.linux-usb.org -T: quilt kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/ +T: git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6.git S: Supported F: Documentation/usb/ F: drivers/net/usb/ @@@ -6480,12 -6456,6 +6479,12 @@@ S: Maintaine F: Documentation/hwmon/w83793 F: drivers/hwmon/w83793.c +W83795 HARDWARE MONITORING DRIVER +M: Jean Delvare +L: lm-sensors@lm-sensors.org +S: Maintained +F: drivers/hwmon/w83795.c + W83L51xD SD/MMC CARD INTERFACE DRIVER M: Pierre Ossman S: Maintained @@@ -6610,25 -6580,11 +6609,25 @@@ T: git git://git.kernel.org/pub/scm/lin S: Maintained F: drivers/platform/x86 +XEN PCI SUBSYSTEM +M: Konrad Rzeszutek Wilk +L: xen-devel@lists.xensource.com (moderated for non-subscribers) +S: Supported +F: arch/x86/pci/*xen* +F: drivers/pci/*xen* + +XEN SWIOTLB SUBSYSTEM +M: Konrad Rzeszutek Wilk +L: xen-devel@lists.xensource.com (moderated for non-subscribers) +S: Supported +F: arch/x86/xen/*swiotlb* +F: drivers/xen/*swiotlb* + XEN HYPERVISOR INTERFACE -M: Jeremy Fitzhardinge -M: Chris Wright +M: Jeremy Fitzhardinge +M: Konrad Rzeszutek Wilk +L: xen-devel@lists.xensource.com (moderated for non-subscribers) L: virtualization@lists.osdl.org -L: xen-devel@lists.xensource.com S: Supported F: arch/x86/xen/ F: drivers/*/xen-*front.c