| commit | 6553daeafb4fa15cd07088f543352fa3779e86e1 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | Sun Sep 16 21:15:36 2007 -0700 |
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | Sun Sep 16 21:15:36 2007 -0700 |
| tree | 1e1952e7ce3227160a9bec60b24dc816f495b6b8 | |
| parent | edb1e9671a990e6eb9f593636deed7ac43ba9084 [diff] | |
| parent | 8a177c4f17c691c2c9a08a54709d37c6db481a0b [diff] |
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.