]> err.no Git - linux-2.6/commitdiff
projects / linux-2.6 / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 66337da 37e64e5)
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Thu, 6 Jul 2006 04:08:35 +0000 (21:08 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Thu, 6 Jul 2006 04:08:35 +0000 (21:08 -0700)
* 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.


Trivial merge
Linux 2.6 source tree