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

Browse source

...

This commit is contained in:

David S. Miller 2011-03-15 14:50:09 -07:00

parent 918690f981 7ef5ed1ce9

commit d87f4fe212

3 changed files with 48 additions and 2 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/igb/e1000_defines.h

View file

3

drivers/net/igb/e1000_regs.h

View file

42

drivers/net/igb/igb_main.c

View file