Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 27 Aug 2008 21:31:27 +0000 (14:31 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 27 Aug 2008 21:31:27 +0000 (14:31 -0700)
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
  sparc: Add target for a stripped kernel
  sparc64: Make NUMA depend upon SMP.


Trivial merge