From: Linus Torvalds Date: Wed, 27 Jan 2010 10:47:24 +0000 (-0800) Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6 X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=5bc6d799e1158b0a9d99fe1d92b397214fa76f91;p=people%2Fsstabellini%2Flinux-pvhvm-deprecated.git Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6: sparc64: Fix UP build. --- 5bc6d799e1158b0a9d99fe1d92b397214fa76f91