Merge branch 'stable-3.2' into pandora-3.2-stable

diff --cc arch/arm/Kconfig
Simple merge

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

diff --cc drivers/gpio/gpio-omap.c
Simple merge

diff --cc drivers/video/omap2/dss/hdmi.c
Simple merge

diff --cc fs/namei.c
Simple merge

diff --cc fs/notify/mark.c
Simple merge

diff --cc include/video/omapdss.h
Simple merge