Merge 3.16-rc4 into staging-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 8 Jul 2014 00:59:07 +0000 (17:59 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 8 Jul 2014 00:59:07 +0000 (17:59 -0700)
We want the staging tree fixes in here as well.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1  2 
MAINTAINERS
drivers/iio/adc/ad799x.c
drivers/staging/tidspbridge/core/tiomap3430.c

diff --cc MAINTAINERS
Simple merge
Simple merge