Merge branch 'linux-2.6' into for-2.6.22
[linux-2.6] / drivers / ide / ppc /
drwxr-xr-x   ..
-rw-r--r-- 20220 mpc8xx.c
-rw-r--r-- 56411 pmac.c