Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/jkirsher/net

Browse source

...

This commit is contained in:

David S. Miller 2011-08-13 02:26:48 -07:00

parent 73e0881d31 c6e7f51e73

commit 7612bd8483

4 changed files with 135 additions and 18 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

4

drivers/net/e1000e/e1000.h

View file

67

drivers/net/e1000e/ich8lan.c

View file

80

drivers/net/e1000e/netdev.c

View file

4

drivers/net/ixgbe/ixgbe_main.c

View file