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

Browse source

Conflicts:
	drivers/net/smsc911x.c

...

This commit is contained in:

David S. Miller 2011-04-11 13:44:25 -07:00

parent c44d79950b 4a9f65f630

commit 1c01a80cfe

2767 changed files with 7361 additions and 8179 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

2

include/linux/ethtool.h

View file