Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

Browse source

Conflicts:
	drivers/net/netxen/netxen_nic_main.c

...

This commit is contained in:

David S. Miller 2009-08-13 19:59:44 -07:00

parent e5e2a8fd83 232e7d68d5

commit 5c16807d3d

6 changed files with 94 additions and 53 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/8139cp.c

View file

7

drivers/net/can/dev.c

View file

27

drivers/net/ixgbe/ixgbe_ethtool.c

View file

2

drivers/net/netxen/netxen_nic.h

View file

7

drivers/net/netxen/netxen_nic_init.c

View file

99

drivers/net/netxen/netxen_nic_main.c

View file