Manual merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/jgarzik/netdev...
[linux-2.6] / drivers / ide / ppc /
drwxr-xr-x   ..
-rw-r--r-- 20271 mpc8xx.c
-rw-r--r-- 60101 pmac.c