Merge branch 'stable-3.2' into pandora-3.2

diff --cc drivers/usb/gadget/f_mass_storage.c
Simple merge

diff --cc fs/autofs4/dev-ioctl.c
Simple merge

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

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

diff --cc kernel/signal.c
Simple merge

diff --cc security/commoncap.c
Simple merge