Automerge with /usr/src/ntfs-2.6.git.
[linux-2.6] / drivers / ide / ppc /
drwxr-xr-x   ..
-rw-r--r-- 20271 mpc8xx.c
-rw-r--r-- 60101 pmac.c