Merge 3.18-rc4 into staging-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 10 Nov 2014 03:24:26 +0000 (12:24 +0900)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 10 Nov 2014 03:24:26 +0000 (12:24 +0900)
commitcc03f9bc2650634ce5ec0233f5ee12e6b67f74c6
treefc9726003631b9ed9da7fc73db53ed47317198cf
parentd48037f9169f653d1124eb75157293d875e7e57f
parent206c5f60a3d902bc4b56dab2de3e88de5eb06108
Merge 3.18-rc4 into staging-next

We want the staging fixes in here as well.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
MAINTAINERS
drivers/iio/proximity/as3935.c