Merge branch 'audit.b32' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit...
[pandora-kernel.git] / mm / hugetlb.c
diff --cc mm/hugetlb.c
Simple merge