Merge branch 'stable-3.2' into pandora-3.2

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

diff --cc arch/arm/mm/alignment.c
Simple merge

diff --cc arch/arm/mm/proc-arm920.S
Simple merge

diff --cc arch/arm/mm/proc-arm926.S
Simple merge

diff --cc arch/arm/mm/proc-sa1100.S
Simple merge

diff --cc arch/arm/mm/proc-v6.S
Simple merge

diff --cc arch/arm/mm/proc-xsc3.S
Simple merge

diff --cc arch/arm/mm/proc-xscale.S
Simple merge

diff --cc arch/x86/Kconfig
Simple merge

diff --cc fs/cifs/cifsfs.c
Simple merge

diff --cc fs/exec.c
Simple merge

diff --cc fs/inode.c
Simple merge

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

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

diff --cc fs/ubifs/ubifs.h
Simple merge

diff --cc include/linux/mm.h
Simple merge

diff --cc include/linux/writeback.h
Simple merge

diff --cc kernel/sched.c
Simple merge

diff --cc kernel/signal.c
Simple merge

diff --cc kernel/trace/trace.c
Simple merge

diff --cc kernel/trace/trace.h
Simple merge

diff --cc mm/hugetlb.c
Simple merge

diff --cc mm/memory.c
Simple merge

diff --cc mm/memory_hotplug.c
Simple merge

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

diff --cc mm/page_alloc.c
Simple merge

diff --cc mm/shmem.c
Simple merge