Merge 3.12-rc6 into staging-next.
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 19 Oct 2013 20:14:34 +0000 (13:14 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 19 Oct 2013 20:14:34 +0000 (13:14 -0700)
commitf7a0fd56e4f58aec3300082fc10433052e2f1863
tree4b3348f4866f6b3417f456a298229d63d4581424
parent5e1e704a7de14ae79dc4d983dbbcab67064960c9
parent31d141e3a666269a3b6fcccddb0351caf7454240
Merge 3.12-rc6 into staging-next.

We want these fixes in here as well.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
MAINTAINERS
drivers/iio/frequency/adf4350.c
drivers/iio/industrialio-buffer.c