Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Mon, 17 Sep 2007 04:15:36 +0000 (21:15 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Mon, 17 Sep 2007 04:15:36 +0000 (21:15 -0700)
commit6553daeafb4fa15cd07088f543352fa3779e86e1
tree1e1952e7ce3227160a9bec60b24dc816f495b6b8
parentedb1e9671a990e6eb9f593636deed7ac43ba9084
parent8a177c4f17c691c2c9a08a54709d37c6db481a0b
Merge branch 'master' of /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.