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.
This commit is contained in:
Linus Torvalds 2010-01-27 02:47:24 -08:00
commit 5bc6d799e1