Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 16 Jan 2009 00:53:42 +0000 (16:53 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 16 Jan 2009 00:53:42 +0000 (16:53 -0800)
commita9f8d25b655c7b5e08c9ed67a2fd2fdbe79404a6
treef830b5218064a4902fe5650173c015bf3f1685eb
parent3feeba1e53f54f726a39da254a5c41e02530255e
parent7a6046ebe28d6a5d259097dcb44162e5a6eca88e
Merge git://git./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.