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 drivers/power/Kconfig URL: http://gitweb.enneenne.com/?p=linuxpps;a=commit;h=195be1c2086929efe1ca315e23f031f06e086369