Merge 3.13-rc5 into staging-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 24 Dec 2013 18:06:37 +0000 (10:06 -0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 24 Dec 2013 18:06:37 +0000 (10:06 -0800)
commit912cbd495204ee6fcb67b8704ffbda10615d1f2f
tree1053bc0bf681a7a4448b5344dddb5f425e0b7920
parent1785faacf3ac245f5e8d920197cd09a65a68f17f
parent413541dd66d51f791a0b169d9b9014e4f56be13c
Merge 3.13-rc5 into staging-next

This resolves a merge issue with drivers/staging/imx-drm/imx-drm-core.c

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/comedi/drivers.c
drivers/staging/comedi/drivers/8255_pci.c
drivers/staging/iio/magnetometer/hmc5843.c
drivers/staging/imx-drm/imx-drm-core.c
drivers/staging/imx-drm/ipu-v3/ipu-common.c