Merge 4.10-rc7 into staging-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 6 Feb 2017 08:36:10 +0000 (09:36 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 6 Feb 2017 08:36:10 +0000 (09:36 +0100)
This resolves the merge errors that were reported in linux-next and it
picks up the staging and IIO fixes that we need/want in here as well.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1  2 
MAINTAINERS
drivers/iio/health/max30100.c

diff --cc MAINTAINERS
Simple merge
Simple merge