]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commitd5ac108b88132a4a873a46c0b75706f88f36f3f2
tree282180d93a177bb61d22190f72c54bc029302b24
parenta485b927713a6697063dcc8ed6c310b0077daded
parentbc25b6c102b413f911b5083264004c34f7e58e6c
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