Merge branch 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
[sfrench/cifs-2.6.git] / include / asm-x86 / numa_32.h
1
2 int pxm_to_nid(int pxm);
3