Merge 3.5-rc4 into staging-next

This picks up the staging changes made in 3.5-rc4 so that everyone can sync up
properly.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --cc drivers/iio/Kconfig
Simple merge

diff --cc drivers/staging/gdm72xx/netlink_k.c
Simple merge

diff --cc drivers/staging/rtl8712/usb_intf.c
Simple merge

diff --cc drivers/staging/zcache/zcache-main.c
Simple merge

diff --cc fs/pstore/platform.c
Simple merge