Merge 3.12-rc4 into staging-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 7 Oct 2013 00:22:43 +0000 (17:22 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 7 Oct 2013 00:22:43 +0000 (17:22 -0700)
We want the staging fixes in this branch as well.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1  2 
MAINTAINERS
drivers/iio/industrialio-core.c
drivers/iio/magnetometer/st_magn_core.c

diff --cc MAINTAINERS
Simple merge
Simple merge