Merge git://git.infradead.org/battery-2.6
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Fri, 3 Aug 2007 22:08:30 +0000 (15:08 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Fri, 3 Aug 2007 22:08:30 +0000 (15:08 -0700)
commit195be1c2086929efe1ca315e23f031f06e086369
treecc3b8d03b6c668a61077c761e1acc66943f2427b
parent34bac238cc13cdb57f3b353b6e5ed3eae2cff158
parenta1da5f4f1beb8cae83104a65f36afe527184a4ef
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