tree e045433982a9f367e9fc1fe34c845b362cadcb1c
parent 2caf959966d540c9a2358c6b74f67aa86248e34b
parent 349101da8e1f8e5eb1476b02823da80495224485
author Linus Torvalds <torvalds@linux-foundation.org> 1219872687 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1219872687 -0700

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:
  sparc: Add target for a stripped kernel
  sparc64: Make NUMA depend upon SMP.