Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
commite2a305ecb5734f24d3a4496605a6fdf27ddf7108
authorLinus Torvalds <torvalds@g5.osdl.org>
Thu, 6 Jul 2006 04:08:35 +0000 (5 21:08 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Thu, 6 Jul 2006 04:08:35 +0000 (5 21:08 -0700)
tree20bd9565d404f42d368f0b095a6727e8c1f1c983
parent66337dab951a9da0873bb1d7dbf36fb668417274
parent37e64e5ae1a9554762b6ec494871adcf48be20cf
Merge /pub/scm/linux/kernel/git/davem/sparc-2.6

* master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
  [SPARC64]: Fix stack overflow checking in modular non-SMP kernels.
  [SPARC64]: Fix sparc64 build errors when CONFIG_PCI=n.