Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:
  3c509: Add missing EISA IDs
  MAINTAINERS: take maintainership of the cpmac Ethernet driver
  net/firmare: Ignore .cis files
  ath1e: add new device id for asus hardware
  mlx4_en: Fix a kernel panic when waking tx queue
  rtl8187: add USB ID for Linksys WUSB54GC-EU v2 USB wifi dongle
  at76c50x-usb: avoid mutex deadlock in at76_dwork_hw_scan
  mac8390: fix build with NET_POLL_CONTROLLER
  cxgb3: link fault fixes
  cxgb3: fix dma mapping regression
  netfilter: nfnetlink_log: fix wrong skbuff size	calculation
  netfilter: xt_hashlimit does a wrong SEQ_SKIP
  bfin_mac: fix build error due to net_device_ops convert
  atlx: move modinfo data from atlx.h to atl1.c
  gianfar: fix babbling rx error event bug
  cls_cgroup: read classid atomically in classifier
  netfilter: nf_ct_dccp: add missing DCCP protocol changes in event cache
  netfilter: nf_ct_tcp: fix accepting invalid RST segments

diff --combined MAINTAINERS
index 873ca1fce020ba28d370d456683e544a87a04c38,111fc169437a5acdcfeb7aec3b04e9ef53c97eab..cf4abddfc8a40dcc161e851c26294480fff3076f
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -434,7 -434,7 +434,7 @@@ F: arch/alpha
  
  AMD GEODE CS5536 USB DEVICE CONTROLLER DRIVER
  P:    Thomas Dahlmann
 -M:    thomas.dahlmann@amd.com
 +M:    dahlmann.thomas@arcor.de
  L:    linux-geode@lists.infradead.org (moderated for non-subscribers)
  S:    Supported
  F:    drivers/usb/gadget/amd5536udc.*
@@@ -624,7 -624,6 +624,7 @@@ M: paulius.zaleckas@teltonika.l
  L:    linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
  T:    git git://gitorious.org/linux-gemini/mainline.git
  S:    Maintained
 +F:    arch/arm/mach-gemini/
  
  ARM/EBSA110 MACHINE SUPPORT
  P:    Russell King
@@@ -651,7 -650,6 +651,7 @@@ P: Paulius Zalecka
  M:    paulius.zaleckas@teltonika.lt
  L:    linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
  S:    Maintained
 +F:    arch/arm/mm/*-fa*
  
  ARM/FOOTBRIDGE ARCHITECTURE
  P:    Russell King
@@@ -1134,17 -1132,17 +1134,17 @@@ F:   fs/bfs
  F:    include/linux/bfs_fs.h
  
  BLACKFIN ARCHITECTURE
 -P:    Bryan Wu
 -M:    cooloney@kernel.org
 +P:    Mike Frysinger
 +M:    vapier@gentoo.org
  L:    uclinux-dist-devel@blackfin.uclinux.org
  W:    http://blackfin.uclinux.org
  S:    Supported
  F:    arch/blackfin/
  
  BLACKFIN EMAC DRIVER
 -P:    Bryan Wu
 -M:    cooloney@kernel.org
 -L:    uclinux-dist-devel@blackfin.uclinux.org (subscribers-only)
 +P:    Michael Hennerich
 +M:    michael.hennerich@analog.com
 +L:    uclinux-dist-devel@blackfin.uclinux.org
  W:    http://blackfin.uclinux.org
  S:    Supported
  F:    drivers/net/bfin_mac.*
@@@ -1152,7 -1150,7 +1152,7 @@@
  BLACKFIN RTC DRIVER
  P:    Mike Frysinger
  M:    vapier.adi@gmail.com
 -L:    uclinux-dist-devel@blackfin.uclinux.org (subscribers-only)
 +L:    uclinux-dist-devel@blackfin.uclinux.org
  W:    http://blackfin.uclinux.org
  S:    Supported
  F:    drivers/rtc/rtc-bfin.c
@@@ -1160,7 -1158,7 +1160,7 @@@
  BLACKFIN SERIAL DRIVER
  P:    Sonic Zhang
  M:    sonic.zhang@analog.com
 -L:    uclinux-dist-devel@blackfin.uclinux.org (subscribers-only)
 +L:    uclinux-dist-devel@blackfin.uclinux.org
  W:    http://blackfin.uclinux.org
  S:    Supported
  F:    drivers/serial/bfin_5xx.c
@@@ -1168,7 -1166,7 +1168,7 @@@
  BLACKFIN WATCHDOG DRIVER
  P:    Mike Frysinger
  M:    vapier.adi@gmail.com
 -L:    uclinux-dist-devel@blackfin.uclinux.org (subscribers-only)
 +L:    uclinux-dist-devel@blackfin.uclinux.org
  W:    http://blackfin.uclinux.org
  S:    Supported
  F:    drivers/watchdog/bfin_wdt.c
@@@ -1176,7 -1174,7 +1176,7 @@@
  BLACKFIN I2C TWI DRIVER
  P:    Sonic Zhang
  M:    sonic.zhang@analog.com
 -L:    uclinux-dist-devel@blackfin.uclinux.org (subscribers-only)
 +L:    uclinux-dist-devel@blackfin.uclinux.org
  W:    http://blackfin.uclinux.org/
  S:    Supported
  F:    drivers/i2c/busses/i2c-bfin-twi.c
@@@ -1433,14 -1431,6 +1433,14 @@@ P:    Russell Kin
  M:    linux@arm.linux.org.uk
  F:    include/linux/clk.h
  
 +CISCO FCOE HBA DRIVER
 +P:    Abhijeet Joglekar
 +M:    abjoglek@cisco.com
 +P:    Joe Eykholt
 +M:    jeykholt@cisco.com
 +L:    linux-scsi@vger.kernel.org
 +S:    Supported
 +
  CODA FILE SYSTEM
  P:    Jan Harkes
  M:    jaharkes@cs.cmu.edu
@@@ -1542,6 -1532,13 +1542,13 @@@ W:    http://www.fi.muni.cz/~kas/cosa
  S:    Maintained
  F:    drivers/net/wan/cosa*
  
+ CPMAC ETHERNET DRIVER
+ P:    Florian Fainelli
+ M:    florian@openwrt.org
+ L:    netdev@vger.kernel.org
+ S:    Maintained
+ F:    drivers/net/cpmac.c
+ 
  CPU FREQUENCY DRIVERS
  P:    Dave Jones
  M:    davej@redhat.com
@@@ -1973,8 -1970,8 +1980,8 @@@ F:      include/linux/edac.
  
  EDAC-E752X
  P:    Mark Gross
 -P:    Doug Thompson
  M:    mark.gross@intel.com
 +P:    Doug Thompson
  M:    dougthompson@xmission.com
  L:    bluesmoke-devel@lists.sourceforge.net (moderated for non-subscribers)
  W:    bluesmoke.sourceforge.net
@@@ -2251,7 -2248,7 +2258,7 @@@ P:      Li Yan
  M:    leoli@freescale.com
  P:    Zhang Wei
  M:    zw@zh-kernel.org
 -L:    linuxppc-embedded@ozlabs.org
 +L:    linuxppc-dev@ozlabs.org
  L:    linux-kernel@vger.kernel.org
  S:    Maintained
  F:    drivers/dma/fsldma.*
@@@ -5589,14 -5586,6 +5596,14 @@@ M:    ian@mnementh.co.u
  S:    Maintained
  F:    drivers/mmc/host/tmio_mmc.*
  
 +TMPFS (SHMEM FILESYSTEM)
 +P:    Hugh Dickins
 +M:    hugh.dickins@tiscali.co.uk
 +L:    linux-mm@kvack.org
 +S:    Maintained
 +F:    include/linux/shmem_fs.h
 +F:    mm/shmem.c
 +
  TPM DEVICE DRIVER
  P:    Debora Velarde
  M:    debora@linux.vnet.ibm.com