Merge git://git.infradead.org/~dwmw2/battery-2.6
[linux-2.6] / drivers / ide / ppc /
drwxr-xr-x   ..
-rw-r--r-- 20220 mpc8xx.c
-rw-r--r-- 55977 pmac.c