Merge 3.11-rc3 into staging-next

We want these fixes here.

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

diff --cc drivers/staging/comedi/comedi_fops.c
Simple merge

diff --cc drivers/staging/imx-drm/Kconfig
Simple merge

diff --cc drivers/staging/zram/zram_drv.c
Simple merge