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)
commit02ab343f3b497421793cb4c9725587f9052f7078
tree282180d93a177bb61d22190f72c54bc029302b24
parenteb3e6ae960562c1b12b3d9c7bc80687e155d78d0
parentd0e639c9e06d44e713170031fe05fb60ebe680af
Merge 3.12-rc4 into staging-next

We want the staging fixes in this branch as well.

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