| commit | 79ff1ad2eec1c106962241f6346958b9641e34f3 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Wed Jul 02 18:45:29 2008 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Wed Jul 02 18:45:29 2008 -0700 |
| tree | ec54059a4e9939c0d842ab7fdc77e324ed8fa0f6 | |
| parent | 821b03ffac8851d6bc1d5530183d2ed25adae35d [diff] | |
| parent | 781c74b1e660d045c2e380b4ada02534f415685c [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/mpc5200: Fix lite5200b suspend/resume powerpc/legacy_serial: Bail if reg-offset/shift properties are present powerpc/bootwrapper: update for initrd with simpleImage