]> pilppa.com Git - linux-2.6-omap-h63xx.git/commit
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 3 Jul 2008 01:45:29 +0000 (18:45 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 3 Jul 2008 01:45:29 +0000 (18:45 -0700)
commit79ff1ad2eec1c106962241f6346958b9641e34f3
treeec54059a4e9939c0d842ab7fdc77e324ed8fa0f6
parent821b03ffac8851d6bc1d5530183d2ed25adae35d
parent781c74b1e660d045c2e380b4ada02534f415685c
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