Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 27 Jan 2010 10:47:24 +0000 (02:47 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 27 Jan 2010 10:47:24 +0000 (02:47 -0800)
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
  sparc64: Fix UP build.


Trivial merge