Automatic merge of /spare/repo/netdev-2.6 branch we18-ieee80211
[linux-2.6] / drivers / ide / ppc /
drwxr-xr-x   ..
-rw-r--r-- 20271 mpc8xx.c
-rw-r--r-- 60101 pmac.c