From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 16 Jan 2009 00:53:42 +0000 (-0800)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
X-Git-Tag: v2.6.29-rc2~10
X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?p=linux-2.6-omap-h63xx.git;a=commitdiff_plain;h=a9f8d25b655c7b5e08c9ed67a2fd2fdbe79404a6

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 failure.
---

a9f8d25b655c7b5e08c9ed67a2fd2fdbe79404a6