Merge branch 'e1000-upstream' of git://198.78.49.142/linux-2.6
[linux-2.6] / drivers / ide / cris /
drwxr-xr-x   ..
-rw-r--r-- 58 Makefile
-rw-r--r-- 29282 ide-cris.c