Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 12 Dec 2009 19:39:09 +0000 (11:39 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 12 Dec 2009 19:39:09 +0000 (11:39 -0800)
commit5de76b18d1a7193c49c1a4ee72261421a17de57c
treecd349813d06b8da020aaec0dcc33d499dd80fad5
parent8d0e7fb9d1581c4543ea917c2ea1a50db607a344
parente1187b3be72be59625e445b186007e6eae27fef1
Merge git://git./linux/kernel/git/davem/net-2.6

* 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