Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial
[linux-2.6] / drivers / ide / cris /
drwxr-xr-x   ..
-rw-r--r-- 58 Makefile
-rw-r--r-- 29096 ide-cris.c