| commit | a19eee5e5e8b11b4a37490f1272d9509dcfcb263 | |
| author | Linus Torvalds <torvalds@linux-foundation.org> | |
| Fri, 19 Sep 2008 23:02:05 +0000 (19 16:02 -0700) | ||
| committer | Linus Torvalds <torvalds@linux-foundation.org> | |
| Fri, 19 Sep 2008 23:02:05 +0000 (19 16:02 -0700) | ||
| tree | 7eb8e3bbbfb89c3d2ed186961b8656b58252f995 | treesnapshot (tar.gz zip) |
| parent | 764527a1b3294b4560203979f39a3671b9a26676 | commitdiff |
| parent | 9843099ff46467461d6476a827f6f9701682dbac | commitdiff |
Merge git://git./linux/kernel/git/davem/sparc-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
sparc64: Fix SMP bootup with CONFIG_STACK_DEBUG or ftrace.
sparc64: Fix OOPS in psycho_pcierr_intr_other().
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
sparc64: Fix SMP bootup with CONFIG_STACK_DEBUG or ftrace.
sparc64: Fix OOPS in psycho_pcierr_intr_other().