Merge commit 'v2.6.32' into reiserfs/kill-bkl
[pandora-kernel.git] / arch / x86 / include / asm / shmbuf.h
1 #include <asm-generic/shmbuf.h>