tree 20bd9565d404f42d368f0b095a6727e8c1f1c983
parent 66337dab951a9da0873bb1d7dbf36fb668417274
parent 37e64e5ae1a9554762b6ec494871adcf48be20cf
author Linus Torvalds <torvalds@g5.osdl.org> 1152158915 -0700
committer Linus Torvalds <torvalds@g5.osdl.org> 1152158915 -0700

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:
  [SPARC64]: Fix stack overflow checking in modular non-SMP kernels.
  [SPARC64]: Fix sparc64 build errors when CONFIG_PCI=n.