| commit | f589b86d4b6e067b720a253bdb40896857804037 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | Mon Dec 03 08:23:58 2007 -0800 |
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | Mon Dec 03 08:23:58 2007 -0800 |
| tree | a0eaff20e2d43b424d4c760ff227b4a47f602044 | |
| parent | c8b1ef88d09961078d3c685fcdc1d1659db05231 [diff] | |
| parent | b80fa3cce7390185e43ea22e9b3c38ab138bc580 [diff] |
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc * 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: [POWERPC] Remove xmon from ml300 and ml403 defconfig in arch/ppc Revert "[POWERPC] Fix RTAS os-term usage on kernel panic"