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)
commitc1a567d31b5488f4593eae7ca215264947b355ca
tree347b8226a2e92676dc2618d8109b99aa275aa31e
parent14b596c9d80bf63da3f0fcbddfd67eb62197afb4
parentcd3de83f147601356395b57a8673e9c5ff1e59d1
Merge 3.16-rc4 into staging-next

We want the staging tree fixes in here as well.

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