Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

Conflicts:
	net/mac80211/main.c

1 files changed, 65 insertions, 34 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index 24fbd772e3b7..102352e6d61d 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -454,9 +454,20 @@ L:	linux-rdma@vger.kernel.org
 S:      Maintained
 F:      drivers/infiniband/hw/amso1100/
 
+ANALOG DEVICES INC ASOC DRIVERS
+L:      uclinux-dist-devel@blackfin.uclinux.org
+L:      alsa-devel@alsa-project.org (moderated for non-subscribers)
+W:      http://blackfin.uclinux.org/
+S:      Supported
+F:      sound/soc/blackfin/*
+F:      sound/soc/codecs/ad1*
+F:      sound/soc/codecs/adau*
+F:      sound/soc/codecs/adav*
+F:      sound/soc/codecs/ssm*
+
 AOA (Apple Onboard Audio) ALSA DRIVER
 M:      Johannes Berg <johannes@sipsolutions.net>
-L:      linuxppc-dev@ozlabs.org
+L:      linuxppc-dev@lists.ozlabs.org
 L:      alsa-devel@alsa-project.org (moderated for non-subscribers)
 S:      Maintained
 F:      sound/aoa/
@@ -1441,6 +1452,16 @@ S:	Maintained
 F:      Documentation/video4linux/cafe_ccic
 F:      drivers/media/video/cafe_ccic*
 
+CAIF NETWORK LAYER
+M:      Sjur Braendeland <sjur.brandeland@stericsson.com>
+L:      netdev@vger.kernel.org
+S:      Supported
+F:      Documentation/networking/caif/
+F:      drivers/net/caif/
+F:      include/linux/caif/
+F:      include/net/caif/
+F:      net/caif/
+
 CALGARY x86-64 IOMMU
 M:      Muli Ben-Yehuda <muli@il.ibm.com>
 M:      "Jon D. Mason" <jdmason@kudzu.us>
@@ -1479,8 +1500,8 @@ F:	include/linux/can/platform/
 
 CELL BROADBAND ENGINE ARCHITECTURE
 M:      Arnd Bergmann <arnd@arndb.de>
-L:      linuxppc-dev@ozlabs.org
-L:      cbe-oss-dev@ozlabs.org
+L:      linuxppc-dev@lists.ozlabs.org
+L:      cbe-oss-dev@lists.ozlabs.org
 W:      http://www.ibm.com/developerworks/power/cell/
 S:      Supported
 F:      arch/powerpc/include/asm/cell*.h
@@ -1672,8 +1693,7 @@ F:	kernel/cgroup*
 F:      mm/*cgroup*
 
 CORETEMP HARDWARE MONITORING DRIVER
-M:      Rudolf Marek <r.marek@assembler.cz>
-M:      Huaxu Wan <huaxu.wan@intel.com>
+M:      Fenghua Yu <fenghua.yu@intel.com>
 L:      lm-sensors@lm-sensors.org
 S:      Maintained
 F:      Documentation/hwmon/coretemp
@@ -2198,6 +2218,12 @@ L:	linux-rdma@vger.kernel.org
 S:      Supported
 F:      drivers/infiniband/hw/ehca/
 
+EHEA (IBM pSeries eHEA 10Gb ethernet adapter) DRIVER
+M:      Breno Leitao <leitao@linux.vnet.ibm.com>
+L:      netdev@vger.kernel.org
+S:      Maintained
+F:      drivers/net/ehea/
+
 EMBEDDED LINUX
 M:      Paul Gortmaker <paul.gortmaker@windriver.com>
 M:      Matt Mackall <mpm@selenic.com>
@@ -2293,6 +2319,12 @@ S:	Maintained
 F:      Documentation/hwmon/f71805f
 F:      drivers/hwmon/f71805f.c
 
+FANOTIFY
+M:      Eric Paris <eparis@redhat.com>
+S:      Maintained
+F:      fs/notify/fanotify/
+F:      include/linux/fanotify.h
+
 FARSYNC SYNCHRONOUS DRIVER
 M:      Kevin Curtis <kevin.curtis@farsite.co.uk>
 W:      http://www.farsite.co.uk/
@@ -2378,13 +2410,13 @@ F:	include/linux/fb.h
 FREESCALE DMA DRIVER
 M:      Li Yang <leoli@freescale.com>
 M:      Zhang Wei <zw@zh-kernel.org>
-L:      linuxppc-dev@ozlabs.org
+L:      linuxppc-dev@lists.ozlabs.org
 S:      Maintained
 F:      drivers/dma/fsldma.*
 
 FREESCALE I2C CPM DRIVER
 M:      Jochen Friedrich <jochen@scram.de>
-L:      linuxppc-dev@ozlabs.org
+L:      linuxppc-dev@lists.ozlabs.org
 L:      linux-i2c@vger.kernel.org
 S:      Maintained
 F:      drivers/i2c/busses/i2c-cpm.c
@@ -2400,7 +2432,7 @@ F:	drivers/video/imxfb.c
 FREESCALE SOC FS_ENET DRIVER
 M:      Pantelis Antoniou <pantelis.antoniou@gmail.com>
 M:      Vitaly Bordug <vbordug@ru.mvista.com>
-L:      linuxppc-dev@ozlabs.org
+L:      linuxppc-dev@lists.ozlabs.org
 L:      netdev@vger.kernel.org
 S:      Maintained
 F:      drivers/net/fs_enet/
@@ -2408,7 +2440,7 @@ F:	include/linux/fs_enet_pd.h
 
 FREESCALE QUICC ENGINE LIBRARY
 M:      Timur Tabi <timur@freescale.com>
-L:      linuxppc-dev@ozlabs.org
+L:      linuxppc-dev@lists.ozlabs.org
 S:      Supported
 F:      arch/powerpc/sysdev/qe_lib/
 F:      arch/powerpc/include/asm/*qe.h
@@ -2416,27 +2448,27 @@ F:	arch/powerpc/include/asm/*qe.h
 FREESCALE USB PERIPHERAL DRIVERS
 M:      Li Yang <leoli@freescale.com>
 L:      linux-usb@vger.kernel.org
-L:      linuxppc-dev@ozlabs.org
+L:      linuxppc-dev@lists.ozlabs.org
 S:      Maintained
 F:      drivers/usb/gadget/fsl*
 
 FREESCALE QUICC ENGINE UCC ETHERNET DRIVER
 M:      Li Yang <leoli@freescale.com>
 L:      netdev@vger.kernel.org
-L:      linuxppc-dev@ozlabs.org
+L:      linuxppc-dev@lists.ozlabs.org
 S:      Maintained
 F:      drivers/net/ucc_geth*
 
 FREESCALE QUICC ENGINE UCC UART DRIVER
 M:      Timur Tabi <timur@freescale.com>
-L:      linuxppc-dev@ozlabs.org
+L:      linuxppc-dev@lists.ozlabs.org
 S:      Supported
 F:      drivers/serial/ucc_uart.c
 
 FREESCALE SOC SOUND DRIVERS
 M:      Timur Tabi <timur@freescale.com>
 L:      alsa-devel@alsa-project.org (moderated for non-subscribers)
-L:      linuxppc-dev@ozlabs.org
+L:      linuxppc-dev@lists.ozlabs.org
 S:      Supported
 F:      sound/soc/fsl/fsl*
 F:      sound/soc/fsl/mpc8610_hpcd.c
@@ -2571,7 +2603,7 @@ F:	mm/memory-failure.c
 F:      mm/hwpoison-inject.c
 
 HYPERVISOR VIRTUAL CONSOLE DRIVER
-L:      linuxppc-dev@ozlabs.org
+L:      linuxppc-dev@lists.ozlabs.org
 S:      Odd Fixes
 F:      drivers/char/hvc_*
 
@@ -3489,9 +3521,9 @@ F:	drivers/usb/misc/legousbtower.c
 
 LGUEST
 M:      Rusty Russell <rusty@rustcorp.com.au>
-L:      lguest@ozlabs.org
+L:      lguest@lists.ozlabs.org
 W:      http://lguest.ozlabs.org/
-S:      Maintained
+S:      Odd Fixes
 F:      Documentation/lguest/
 F:      arch/x86/lguest/
 F:      drivers/lguest/
@@ -3508,7 +3540,7 @@ LINUX FOR POWERPC (32-BIT AND 64-BIT)
 M:      Benjamin Herrenschmidt <benh@kernel.crashing.org>
 M:      Paul Mackerras <paulus@samba.org>
 W:      http://www.penguinppc.org/
-L:      linuxppc-dev@ozlabs.org
+L:      linuxppc-dev@lists.ozlabs.org
 Q:      http://patchwork.ozlabs.org/project/linuxppc-dev/list/
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc.git
 S:      Supported
@@ -3518,14 +3550,14 @@ F:	arch/powerpc/
 LINUX FOR POWER MACINTOSH
 M:      Benjamin Herrenschmidt <benh@kernel.crashing.org>
 W:      http://www.penguinppc.org/
-L:      linuxppc-dev@ozlabs.org
+L:      linuxppc-dev@lists.ozlabs.org
 S:      Maintained
 F:      arch/powerpc/platforms/powermac/
 F:      drivers/macintosh/
 
 LINUX FOR POWERPC EMBEDDED MPC5XXX
 M:      Grant Likely <grant.likely@secretlab.ca>
-L:      linuxppc-dev@ozlabs.org
+L:      linuxppc-dev@lists.ozlabs.org
 T:      git git://git.secretlab.ca/git/linux-2.6.git
 S:      Maintained
 F:      arch/powerpc/platforms/512x/
@@ -3535,7 +3567,7 @@ LINUX FOR POWERPC EMBEDDED PPC4XX
 M:      Josh Boyer <jwboyer@linux.vnet.ibm.com>
 M:      Matt Porter <mporter@kernel.crashing.org>
 W:      http://www.penguinppc.org/
-L:      linuxppc-dev@ozlabs.org
+L:      linuxppc-dev@lists.ozlabs.org
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/jwboyer/powerpc-4xx.git
 S:      Maintained
 F:      arch/powerpc/platforms/40x/
@@ -3544,7 +3576,7 @@ F:	arch/powerpc/platforms/44x/
 LINUX FOR POWERPC EMBEDDED XILINX VIRTEX
 M:      Grant Likely <grant.likely@secretlab.ca>
 W:      http://wiki.secretlab.ca/index.php/Linux_on_Xilinx_Virtex
-L:      linuxppc-dev@ozlabs.org
+L:      linuxppc-dev@lists.ozlabs.org
 T:      git git://git.secretlab.ca/git/linux-2.6.git
 S:      Maintained
 F:      arch/powerpc/*/*virtex*
@@ -3554,20 +3586,20 @@ LINUX FOR POWERPC EMBEDDED PPC8XX
 M:      Vitaly Bordug <vitb@kernel.crashing.org>
 M:      Marcelo Tosatti <marcelo@kvack.org>
 W:      http://www.penguinppc.org/
-L:      linuxppc-dev@ozlabs.org
+L:      linuxppc-dev@lists.ozlabs.org
 S:      Maintained
 F:      arch/powerpc/platforms/8xx/
 
 LINUX FOR POWERPC EMBEDDED PPC83XX AND PPC85XX
 M:      Kumar Gala <galak@kernel.crashing.org>
 W:      http://www.penguinppc.org/
-L:      linuxppc-dev@ozlabs.org
+L:      linuxppc-dev@lists.ozlabs.org
 S:      Maintained
 F:      arch/powerpc/platforms/83xx/
 
 LINUX FOR POWERPC PA SEMI PWRFICIENT
 M:      Olof Johansson <olof@lixom.net>
-L:      linuxppc-dev@ozlabs.org
+L:      linuxppc-dev@lists.ozlabs.org
 S:      Maintained
 F:      arch/powerpc/platforms/pasemi/
 F:      drivers/*/*pasemi*
@@ -3920,8 +3952,7 @@ F:	Documentation/sound/oss/MultiSound
 F:      sound/oss/msnd*
 
 MULTITECH MULTIPORT CARD (ISICOM)
-M:      Jiri Slaby <jirislaby@gmail.com>
-S:      Maintained
+S:      Orphan
 F:      drivers/char/isicom.c
 F:      include/linux/isicom.h
 
@@ -4600,7 +4631,7 @@ F:	include/linux/preempt.h
 PRISM54 WIRELESS DRIVER
 M:      "Luis R. Rodriguez" <mcgrof@gmail.com>
 L:      linux-wireless@vger.kernel.org
-W:      http://prism54.org
+W:      http://wireless.kernel.org/en/users/Drivers/p54
 S:      Obsolete
 F:      drivers/net/wireless/prism54/
 
@@ -4613,14 +4644,14 @@ F:	drivers/ata/sata_promise.*
 PS3 NETWORK SUPPORT
 M:      Geoff Levand <geoff@infradead.org>
 L:      netdev@vger.kernel.org
-L:      cbe-oss-dev@ozlabs.org
+L:      cbe-oss-dev@lists.ozlabs.org
 S:      Maintained
 F:      drivers/net/ps3_gelic_net.*
 
 PS3 PLATFORM SUPPORT
 M:      Geoff Levand <geoff@infradead.org>
-L:      linuxppc-dev@ozlabs.org
-L:      cbe-oss-dev@ozlabs.org
+L:      linuxppc-dev@lists.ozlabs.org
+L:      cbe-oss-dev@lists.ozlabs.org
 S:      Maintained
 F:      arch/powerpc/boot/ps3*
 F:      arch/powerpc/include/asm/lv1call.h
@@ -4634,7 +4665,7 @@ F:	sound/ppc/snd_ps3*
 
 PS3VRAM DRIVER
 M:      Jim Paris <jim@jtan.com>
-L:      cbe-oss-dev@ozlabs.org
+L:      cbe-oss-dev@lists.ozlabs.org
 S:      Maintained
 F:      drivers/block/ps3vram.c
 
@@ -5080,7 +5111,7 @@ F:	drivers/mmc/host/sdhci.*
 
 SECURE DIGITAL HOST CONTROLLER INTERFACE, OPEN FIRMWARE BINDINGS (SDHCI-OF)
 M:      Anton Vorontsov <avorontsov@ru.mvista.com>
-L:      linuxppc-dev@ozlabs.org
+L:      linuxppc-dev@lists.ozlabs.org
 L:      linux-mmc@vger.kernel.org
 S:      Maintained
 F:      drivers/mmc/host/sdhci-of.*
@@ -5497,8 +5528,8 @@ F:	drivers/net/spider_net*
 
 SPU FILE SYSTEM
 M:      Jeremy Kerr <jk@ozlabs.org>
-L:      linuxppc-dev@ozlabs.org
-L:      cbe-oss-dev@ozlabs.org
+L:      linuxppc-dev@lists.ozlabs.org
+L:      cbe-oss-dev@lists.ozlabs.org
 W:      http://www.ibm.com/developerworks/power/cell/
 S:      Supported
 F:      Documentation/filesystems/spufs.txt