From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Sun, 18 Mar 2007 00:05:16 +0000 (-0700)
Subject: Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
X-Git-Tag: v2.6.21-rc5~68
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=b720a3be1abd0cb5b9b530c0a1b4044fec4de60e;p=linux-2.6-omap-h63xx.git

Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6

* master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
  [SPARC64]: Use Kconfig.preempt
---

b720a3be1abd0cb5b9b530c0a1b4044fec4de60e