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

Browse source

* 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.

...

This commit is contained in:

Linus Torvalds 2008-10-12 11:40:34 -07:00

parent 1efd325fba f3073ac767

commit 589acce53e

4 changed files with 11 additions and 3 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

5

drivers/net/e1000/e1000_main.c

View file

3

drivers/net/smc911x.c

View file

2

net/ipv4/ip_gre.c

View file

4

net/netfilter/ipvs/Kconfig

View file