From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 27 Aug 2008 21:31:27 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
X-Git-Tag: v2.6.27-rc5~16
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3d87ff3e44bd2a13cbe2d2e02cc5e38953ff260f;p=linux-2.6

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

3d87ff3e44bd2a13cbe2d2e02cc5e38953ff260f