summaryrefslogtreecommitdiff
path: root/init
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-08-26 20:54:48 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2009-08-26 20:54:48 -0700
commit1e23502cc57cef33455ac7cb9111e3c6d991a894 (patch)
tree38b21cfd31bfd7d9d987cb4d7c1e51d673a9a8e7 /init
parente99b1f22f91cc5e2d06699b3d8958a0ff6cb24d9 (diff)
parent3161e453e496eb5643faad30fff5a5ab183da0fe (diff)
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 'init')
0 files changed, 0 insertions, 0 deletions