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: (60 commits)
  net: restore gnet_stats_basic to previous definition
  NETROM: Fix use of static buffer
  e1000e: fix use of pci_enable_pcie_error_reporting
  e1000e: WoL does not work on 82577/82578 with manageability enabled
  cnic: Fix locking in init/exit calls.
  cnic: Fix locking in start/stop calls.
  bnx2: Use mutex on slow path cnic calls.
  cnic: Refine registration with bnx2.
  cnic: Fix symbol_put_addr() panic on ia64.
  gre: Fix MTU calculation for bound GRE tunnels
  pegasus: Add new device ID.
  drivers/net: fixed drivers that support netpoll use ndo_start_xmit()
  via-velocity: Fix test of mii_status bit VELOCITY_DUPLEX_FULL
  rt2x00: fix memory corruption in rf cache, add a sanity check
  ixgbe: Fix receive on real device when VLANs are configured
  ixgbe: Do not return 0 in ixgbe_fcoe_ddp() upon FCP_RSP in DDP completion
  netxen: free napi resources during detach
  netxen: remove netxen workqueue
  ixgbe: fix issues setting rx-usecs with legacy interrupts
  can: fix oops caused by wrong rtnl newlink usage
  ...

diff --combined MAINTAINERS
index 2c4326c,aee67a8..557d4dc
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -904,7 -904,7 +904,7 @@@ F: drivers/input/misc/ati_remote2.
  
  ATLX ETHERNET DRIVERS
  M:    Jay Cliburn <jcliburn@gmail.com>
- M:    Chris Snook <csnook@redhat.com>
+ M:    Chris Snook <chris.snook@gmail.com>
  M:    Jie Yang <jie.yang@atheros.com>
  L:    atl1-devel@lists.sourceforge.net
  W:    http://sourceforge.net/projects/atl1
@@@ -2238,14 -2238,6 +2238,14 @@@ T:    git git://git.kernel.org/pub/scm/lin
  S:    Maintained
  F:    drivers/media/video/gspca/pac207.c
  
 +GSPCA SN9C20X SUBDRIVER
 +P:    Brian Johnson
 +M:    brijohn@gmail.com
 +L:    linux-media@vger.kernel.org
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6.git
 +S:    Maintained
 +F:    drivers/media/video/gspca/sn9c20x.c
 +
  GSPCA T613 SUBDRIVER
  M:    Leandro Costantino <lcostantino@gmail.com>
  L:    linux-media@vger.kernel.org
@@@ -3563,6 -3555,9 +3563,9 @@@ T:      git git://git.kernel.org/pub/scm/lin
  S:    Maintained
  F:    net/
  F:    include/net/
+ F:    include/linux/in.h
+ F:    include/linux/net.h
+ F:    include/linux/netdevice.h
  
  NETWORKING [IPv4/IPv6]
  M:    "David S. Miller" <davem@davemloft.net>
@@@ -3598,6 -3593,8 +3601,8 @@@ W:      http://www.linuxfoundation.org/en/Ne
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6.git
  S:    Odd Fixes
  F:    drivers/net/
+ F:    include/linux/if_*
+ F:    include/linux/*device.h
  
  NETXEN (1/10) GbE SUPPORT
  M:    Dhananjay Phadke <dhananjay@netxen.com>