Merge branch 'akpm' (Andrew's incoming - part two)
[linux-2.6/linux-acpi-2.6/ibm-acpi-2.6.git] / drivers / nubus / 
tree2a79dea3aaa7fc174bfe93248bd82eb8ef8809a0
drwxr-xr-x   ..
-rw-r--r-- 100 Makefile
-rw-r--r-- 27031 nubus.c
-rw-r--r-- 4602 proc.c