Merge branch 'stable-3.2' into pandora-3.2

diff --cc Documentation/kernel-parameters.txt
Simple merge

diff --cc arch/s390/include/asm/hugetlb.h
Simple merge

diff --cc arch/x86/include/asm/hugetlb.h
Simple merge

diff --cc fs/proc/base.c
Simple merge

diff --cc mm/huge_memory.c
Simple merge

diff --cc mm/hugetlb.c
Simple merge