Merge branch 'merge' into powerpc-next
[linux-2.6] / include / asm-sparc64 / bugs.h
1 #include <asm-sparc/bugs.h>