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)
commit3d87ff3e44bd2a13cbe2d2e02cc5e38953ff260f
treee045433982a9f367e9fc1fe34c845b362cadcb1c
parent2caf959966d540c9a2358c6b74f67aa86248e34b
parent349101da8e1f8e5eb1476b02823da80495224485
Merge git://git./linux/kernel/git/davem/sparc-2.6

* 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.