From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 3 Jul 2008 01:45:29 +0000 (-0700)
Subject: Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
X-Git-Tag: v2.6.26-rc9~83
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=79ff1ad2eec1c106962241f6346958b9641e34f3;p=~emulex%2Finfiniband.git

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
---

79ff1ad2eec1c106962241f6346958b9641e34f3