Merge commit 'v2.6.34-rc6' into core/locking
[cascardo/linux.git] / arch / parisc / include / asm / param.h
1 #include <asm-generic/param.h>