Merge branch 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jikos/hid
[linux-2.6] / drivers / ide / cris /
drwxr-xr-x   ..
-rw-r--r-- 58 Makefile
-rw-r--r-- 29011 ide-cris.c