Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 20 Jun 2009 00:42:01 +0000 (17:42 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 20 Jun 2009 00:42:01 +0000 (17:42 -0700)
commitee37ba7a4212c7420f12e6a2ad8a3966649ede7a
treea9d3a5088bf7abcfba74c5ce61dd577292c838cd
parent773d7a09e1a1349a5319ac8665e9c612c6aa27d8
parentb99c6ebe8f53dce1f56f0d483f6a7c23edb19d4c
Merge git://git./linux/kernel/git/davem/sparc-next-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next-2.6:
  sparc64: Fix UP bootup regression.