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
This commit is contained in:
Linus Torvalds 2007-08-03 15:08:30 -07:00
commit 195be1c208