Merge branch 'stable-3.2' into pandora-3.2

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

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

diff --cc drivers/base/firmware_class.c
Simple merge

diff --cc drivers/mtd/ubi/upd.c
Simple merge

diff --cc drivers/video/logo/logo.c
Simple merge

diff --cc fs/debugfs/inode.c
Simple merge

diff --cc fs/namei.c
Simple merge

diff --cc fs/splice.c
Simple merge

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

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

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

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

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

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

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

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

diff --cc mm/huge_memory.c
Simple merge

diff --cc mm/memory.c
Simple merge

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