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: (55 commits)
  ISDN, hfcsusb: Don't leak in hfcsusb_ph_info()
  netpoll: call dev_put() on error in netpoll_setup()
  net: ep93xx_eth: fix DMA API violations
  net: ep93xx_eth: drop GFP_DMA from call to dma_alloc_coherent()
  net: ep93xx_eth: allocate buffers using kmalloc()
  net: ep93xx_eth: pass struct device to DMA API functions
  ep93xx: set DMA masks for the ep93xx_eth
  vlan: Fix the ingress VLAN_FLAG_REORDER_HDR check
  dl2k: EEPROM CRC calculation wrong endianess on bigendian machine
  NET: am79c961: fix assembler warnings
  NET: am79c961: ensure multicast filter is correctly set at open
  NET: am79c961: ensure asm() statements are marked volatile
  ethtool.h: fix typos
  ep93xx_eth: Update MAINTAINERS
  ipv4: Fix packet size calculation for raw IPsec packets in __ip_append_data
  netpoll: prevent netpoll setup on slave devices
  net: pmtu_expires fixes
  gianfar:localized filer table
  iwlegacy: fix channel switch locking
  mac80211: fix IBSS teardown race
  ...

diff --combined MAINTAINERS
index bbe49d8,6a1c430..e50fc6e
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -1739,7 -1739,7 +1739,7 @@@ S:      Supporte
  F:    drivers/net/enic/
  
  CIRRUS LOGIC EP93XX ETHERNET DRIVER
- M:    Lennert Buytenhek <kernel@wantstofly.org>
+ M:    Hartley Sweeten <hsweeten@visionengravers.com>
  L:    netdev@vger.kernel.org
  S:    Maintained
  F:    drivers/net/arm/ep93xx_eth.c
@@@ -4252,7 -4252,8 +4252,7 @@@ F:      drivers/mmc
  F:    include/linux/mmc/
  
  MULTIMEDIA CARD (MMC) ETC. OVER SPI
 -M:    David Brownell <dbrownell@users.sourceforge.net>
 -S:    Odd Fixes
 +S:    Orphan
  F:    drivers/mmc/host/mmc_spi.c
  F:    include/linux/spi/mmc_spi.h
  
@@@ -4602,6 -4603,7 +4602,6 @@@ F:      drivers/media/video/omap3isp/
  
  OMAP USB SUPPORT
  M:    Felipe Balbi <balbi@ti.com>
 -M:    David Brownell <dbrownell@users.sourceforge.net>
  L:    linux-usb@vger.kernel.org
  L:    linux-omap@vger.kernel.org
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git
@@@ -4945,7 -4947,6 +4945,7 @@@ T:      git git://git.kernel.org/pub/scm/lin
  F:    drivers/input/serio/i8042-unicore32io.h
  F:    drivers/i2c/busses/i2c-puv3.c
  F:    drivers/video/fb-puv3.c
 +F:    drivers/rtc/rtc-puv3.c
  
  PMC SIERRA MaxRAID DRIVER
  M:    Anil Ravindranath <anil_ravindranath@pmc-sierra.com>
@@@ -5983,6 -5984,7 +5983,6 @@@ F:      Documentation/serial/specialix.tx
  F:    drivers/staging/tty/specialix*
  
  SPI SUBSYSTEM
 -M:    David Brownell <dbrownell@users.sourceforge.net>
  M:    Grant Likely <grant.likely@secretlab.ca>
  L:    spi-devel-general@lists.sourceforge.net
  Q:    http://patchwork.kernel.org/project/spi-devel-general/list/
@@@ -6430,8 -6432,9 +6430,8 @@@ S:      Maintaine
  F:    drivers/usb/misc/rio500*
  
  USB EHCI DRIVER
 -M:    David Brownell <dbrownell@users.sourceforge.net>
  L:    linux-usb@vger.kernel.org
 -S:    Odd Fixes
 +S:    Orphan
  F:    Documentation/usb/ehci.txt
  F:    drivers/usb/host/ehci*
  
@@@ -6445,10 -6448,9 +6445,10 @@@ S:    Maintaine
  F:    drivers/media/video/et61x251/
  
  USB GADGET/PERIPHERAL SUBSYSTEM
 -M:    David Brownell <dbrownell@users.sourceforge.net>
 +M:    Felipe Balbi <balbi@ti.com>
  L:    linux-usb@vger.kernel.org
  W:    http://www.linux-usb.org/gadget
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git
  S:    Maintained
  F:    drivers/usb/gadget/
  F:    include/linux/usb/gadget*
@@@ -6490,8 -6492,9 +6490,8 @@@ S:      Maintaine
  F:    sound/usb/midi.*
  
  USB OHCI DRIVER
 -M:    David Brownell <dbrownell@users.sourceforge.net>
  L:    linux-usb@vger.kernel.org
 -S:    Odd Fixes
 +S:    Orphan
  F:    Documentation/usb/ohci.txt
  F:    drivers/usb/host/ohci*