Merge branch 'x86/core' into tracing/textedit
[linux-2.6] / drivers / nubus /
drwxr-xr-x   ..
-rw-r--r-- 100 Makefile
-rw-r--r-- 27007 nubus.c
-rw-r--r-- 4602 proc.c