| commit | bf640be423d60d954b9673527e106a461a129eb8 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Sat May 03 10:05:11 2008 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Sat May 03 10:05:11 2008 -0700 |
| tree | 654d168d6effc47d18528ef5770c6f6dea51d901 | |
| parent | c36c804559d3a891a2e655ba8185b4fa7eaee156 [diff] | |
| parent | 4a1236ac6ee3bb3a2f585e66871de3c39ab38f7c [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: sparc32: Delete prom_stdin and prom_stdout. sparc32: More memory probing consolidation. sparc32: Kill totally unused memory information tables. sparc64: Fix syscall restart, for real... serial: Fix sparc driver name strings. sparc64: Stop creating dummy root PCI host controller devices.