Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
[linux-2.6] / drivers / ide / ppc /
drwxr-xr-x   ..
-rw-r--r-- 20024 mpc8xx.c
-rw-r--r-- 48754 pmac.c