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)
* git://git.infradead.org/battery-2.6:
  Don't compile the PMU power driver on 64-bit PowerPC


Trivial merge