Merge branch 'master' into upstream-fixes
[linux-2.6] / include / asm-um / topology.h
1 #ifndef _ASM_UM_TOPOLOGY_H
2 #define _ASM_UM_TOPOLOGY_H
3
4 #include <asm-generic/topology.h>
5
6 #endif