6f495b6b8
parent edb1e9671a990e6eb9f593636deed7ac43ba9084
parent 8a177c4f17c691c2c9a08a54709d37c6db481a0b
author Linus Torvalds <torvalds@woody.linux-foundation.org> 1190002536 -0700
committer Linus Torvalds <torvalds@woody.linux-foundation.org> 1190002536 -0700

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