Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-linus
[linux-2.6] / drivers / nubus /
drwxr-xr-x   ..
-rw-r--r-- 100 Makefile
-rw-r--r-- 27008 nubus.c
-rw-r--r-- 4602 proc.c