Merge 3.16-rc2 into staging-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 22 Jun 2014 16:33:51 +0000 (12:33 -0400)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 22 Jun 2014 16:33:51 +0000 (12:33 -0400)
commitef7994fa2aecd8d1fb0d75034caa050ff908d26a
treeaa7bbe9499256ced149dce70891de5eedf33c283
parentad8686bc05adc2b8301d749f5958bd904f3a46ee
parenta497c3ba1d97fc69c1e78e7b96435ba8c2cb42ee
Merge 3.16-rc2 into staging-next

We want the staging fixes here as well.
MAINTAINERS
drivers/iio/adc/at91_adc.c
drivers/staging/comedi/Kconfig
drivers/staging/iio/adc/mxs-lradc.c