| commit | 59b1c82500bb5d658891bc8e8a2308b76d58a4de | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Mon May 12 07:28:37 2008 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Mon May 12 07:28:37 2008 -0700 |
| tree | 493aeea552ba7590b3652614b9caf2a5df11c69c | |
| parent | 454aa3899f0bebb5aa7f8788690668d106f9a34f [diff] | |
| parent | a94a172d6c826232e623160ae134abbce181a41f [diff] |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6: sparc64: Work around memory probing bug in openfirmware. sparc32: fix rtrap.S typo sparc32: Fix build.