From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Fri, 3 Aug 2007 22:08:30 +0000 (-0700)
Subject: Merge git://git.infradead.org/battery-2.6
X-Git-Tag: v2.6.23-rc2~4
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=195be1c2086929efe1ca315e23f031f06e086369;p=~shefty%2Frdma-dev.git

Merge git://git.infradead.org/battery-2.6

* git://git.infradead.org/battery-2.6:
  Don't compile the PMU power driver on 64-bit PowerPC
---

195be1c2086929efe1ca315e23f031f06e086369