Merge commit 'upstream/master'
[linux-2.6] / include / asm-sparc64 / upa.h
1 #include <asm-sparc/upa.h>