tree ec54059a4e9939c0d842ab7fdc77e324ed8fa0f6
parent 821b03ffac8851d6bc1d5530183d2ed25adae35d
parent 781c74b1e660d045c2e380b4ada02534f415685c
author Linus Torvalds <torvalds@linux-foundation.org> 1215049529 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1215049529 -0700

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