Merge 4.0-rc3 into staging-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 9 Mar 2015 07:13:01 +0000 (08:13 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 9 Mar 2015 07:13:01 +0000 (08:13 +0100)
commit355a73f07d1da405728c9e57afd6eede340788f4
treebca9d993a19c9cf0940231323ad74fbec605b044
parent197f4d6a4a00915b29fa7ec71f8010b9c763e676
parent9eccca0843205f87c00404b663188b88eb248051
Merge 4.0-rc3 into staging-next

We want the staging fixes in here as well.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
MAINTAINERS
drivers/staging/comedi/drivers/adv_pci1710.c
drivers/staging/comedi/drivers/comedi_isadma.c