Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Tue, 10 Oct 2006 02:35:20 +0000 (19:35 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Tue, 10 Oct 2006 02:35:20 +0000 (19:35 -0700)
commit1601ff0e29cfe112b06aa9bb2fb3519a1125baaa
treec618296e804434eb185bdbd5ec45dd92eae2e74d
parentd942492e1dbce264435daaf40f5742e1aaa5adaf
parent078830eaa8abccd1e95d3effce5b29273bb5ed09
Merge /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.