Merge branch 'stable-3.2' into pandora-3.2

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

diff --cc fs/ubifs/file.c
Simple merge

diff --cc mm/hugetlb.c
Simple merge

diff --cc mm/memory-failure.c
Simple merge

diff --cc mm/memory.c
Simple merge

diff --cc mm/page-writeback.c
Simple merge

diff --cc mm/vmscan.c
Simple merge