Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 12 Oct 2008 18:40:34 +0000 (11:40 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 12 Oct 2008 18:40:34 +0000 (11:40 -0700)
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:
  smc911x: Fix external PHY detection
  e1000: allow VLAN devices to use TSO and CSUM offload
  gre: Initialise rtnl_link tunnel parameters properly
  ipvs: Add proper dependencies on IP_VS, and fix description header line.


Trivial merge