Merge 3.11-rc3 into staging-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 29 Jul 2013 14:40:10 +0000 (07:40 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 29 Jul 2013 14:40:10 +0000 (07:40 -0700)
commit01731cf2eee38410b505c447026e46a591674835
treeeeaea94786b4ca993dd3a40d123eb3b6799da1c9
parent6496c045292b7afe74b5306c123186976f032125
parent5ae90d8e467e625e447000cb4335c4db973b1095
Merge 3.11-rc3 into staging-next

We want these fixes here.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/comedi/comedi_fops.c
drivers/staging/imx-drm/Kconfig
drivers/staging/zram/zram_drv.c