Merge branch 'linus' into tracing/urgent
[linux-2.6] / include / asm-sparc64 / idprom.h
1 #include <asm-sparc/idprom.h>