[git pull] Please pull powerpc.git merge branch

Paul Mackerras
2008-07-02T12:41:23Z

Linus,

Please pull from the 'merge' branch of

git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc.git merge

to get two more small bug-fixes for powerpc, as listed below.

Thanks,
Paul.

arch/powerpc/boot/Makefile | 3 ++-
arch/powerpc/kernel/legacy_serial.c | 5 +++++
2 files changed, 7 insertions(+), 1 deletions(-)

John Linn (2):
powerpc/bootwrapper: update for initrd with simpleImage
powerpc/legacy_serial: Bail if reg-offset/shift properties are present