]> 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)
commitda79e0657fec5d3e475315b3fee38c74fd6d896b
tree282180d93a177bb61d22190f72c54bc029302b24
parentf584332c2b2f53a3dc0d21ba2fefc2e89abbc258
parent87abb37b73608fe4855499580316d54f56b364e8
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