diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2009-08-26 20:54:48 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-08-26 20:54:48 -0700 |
| commit | 1e23502cc57cef33455ac7cb9111e3c6d991a894 (patch) | |
| tree | 38b21cfd31bfd7d9d987cb4d7c1e51d673a9a8e7 /init/main.c | |
| parent | Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc (diff) | |
| parent | virtio: net refill on out-of-memory (diff) | |
| download | linux-dev-1e23502cc57cef33455ac7cb9111e3c6d991a894.tar.xz linux-dev-1e23502cc57cef33455ac7cb9111e3c6d991a894.zip | |
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
Diffstat (limited to '')
0 files changed, 0 insertions, 0 deletions