Merge branches 'release', 'asus', 'sony-laptop' and 'thinkpad' into release
[linux-2.6] / drivers / ide / cris /
drwxr-xr-x   ..
-rw-r--r-- 74 Makefile
-rw-r--r-- 28104 ide-cris.c