Merge branches 'at91', 'ep93xx', 'iop', 'kprobes', 'ks8695', 'misc', 'msm', 's3c2410...
[linux-2.6] / drivers / ide / cris /
drwxr-xr-x   ..
-rw-r--r-- 74 Makefile
-rw-r--r-- 28240 ide-cris.c