Merge v3.13-rc2 into staging-next

we want these fixes in here.

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

diff --cc drivers/iio/accel/hid-sensor-accel-3d.c
Simple merge

diff --cc drivers/iio/adc/mcp3422.c
Simple merge

diff --cc drivers/iio/gyro/hid-sensor-gyro-3d.c
Simple merge

diff --cc drivers/iio/light/hid-sensor-als.c
Simple merge

diff --cc drivers/iio/magnetometer/hid-sensor-magn-3d.c
Simple merge

diff --cc drivers/staging/ft1000/ft1000-usb/ft1000_download.c
Simple merge

diff --cc drivers/staging/imx-drm/imx-drm-core.c
Simple merge

diff --cc drivers/staging/lustre/lustre/ptlrpc/pinger.c
Simple merge

diff --cc drivers/staging/nvec/nvec.c
Simple merge

diff --cc drivers/staging/vt6655/hostap.c
Simple merge

diff --cc drivers/staging/vt6656/baseband.c
Simple merge

diff --cc drivers/staging/vt6656/rndis.h
Simple merge