tree 38b21cfd31bfd7d9d987cb4d7c1e51d673a9a8e7
parent e99b1f22f91cc5e2d06699b3d8958a0ff6cb24d9
parent 3161e453e496eb5643faad30fff5a5ab183da0fe
author Linus Torvalds <torvalds@linux-foundation.org> 1251345288 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1251345288 -0700

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:
  virtio: net refill on out-of-memory
  smc91x: fix compilation on SMP