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:
  be2net: fix error in rx completion processing.
  igbvf: avoid reset storms due to mailbox issues
  igb: fix handling of mailbox collisions between PF/VF
  usb: remove rare pm primitive for conversion to new API

...

This commit is contained in:

Linus Torvalds 2009-12-12 11:39:09 -08:00

parent 8d0e7fb9d1 e1187b3be7

commit 5de76b18d1

5 changed files with 25 additions and 14 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/benet/be_main.c

View file

22

drivers/net/igb/igb_main.c

View file

1

drivers/net/igbvf/igbvf.h

View file

8

drivers/net/igbvf/netdev.c

View file

4

drivers/net/usb/kaweth.c

View file