commit | 1601ff0e29cfe112b06aa9bb2fb3519a1125baaa | [log] [tgz] |
---|---|---|
author | Linus Torvalds <torvalds@g5.osdl.org> | Mon Oct 09 19:35:20 2006 -0700 |
committer | Linus Torvalds <torvalds@g5.osdl.org> | Mon Oct 09 19:35:20 2006 -0700 |
tree | c618296e804434eb185bdbd5ec45dd92eae2e74d | |
parent | d942492e1dbce264435daaf40f5742e1aaa5adaf [diff] | |
parent | 078830eaa8abccd1e95d3effce5b29273bb5ed09 [diff] |
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: [SPARC32]: Fix prom.c build warning [SPARC64]: Update defconfig. [SPARC64]: Fix of_device bus_id settings. [SPARC64]: Update MAINTAINERS entry.