From: Linus Torvalds Date: Thu, 27 Aug 2009 03:54:48 +0000 (-0700) Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 X-Git-Tag: v2.6.31-rc8~9 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1e23502cc57cef33455ac7cb9111e3c6d991a894;p=pandora-kernel.git Merge git://git./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 --- 1e23502cc57cef33455ac7cb9111e3c6d991a894 Reading git-diff-tree failed