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)
We want the staging fixes here as well.

1  2 
MAINTAINERS
drivers/iio/adc/at91_adc.c
drivers/staging/comedi/Kconfig
drivers/staging/iio/adc/mxs-lradc.c

diff --cc MAINTAINERS
Simple merge
Simple merge
Simple merge
Simple merge