From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Mon, 17 Sep 2007 04:15:36 +0000 (-0700)
Subject: Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
X-Git-Tag: v2.6.23-rc7~32
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=6553daeafb4fa15cd07088f543352fa3779e86e1;p=~shefty%2Frdma-dev.git

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

* 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
  [SPARC64]: Warn user if cpu is ignored.
  [SPARC64]: Fix lockdep, particularly on SMP.
  [SPARC64]: Update defconfig.
---

6553daeafb4fa15cd07088f543352fa3779e86e1