projects / GitHub / moto-9609 / android_kernel_motorola_exynos9610.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 307a082 d5adbfc)
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)
commita769f30c7bd7cf917eea05a2b448f3588a87d767
tree10a06089a9525926e23675528dd8190d05849143tree | snapshot (tar.gz zip)
parent307a082484eb0201ad123f39f95510a9da11985bcommit | diff
parentd5adbfcd5f7bcc6fa58a41c5c5ada0e5c826ce2ccommit | diff
Merge 4.10-rc7 into staging-next

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>
MAINTAINERS diff1 | diff2 | blob | history
drivers/iio/health/max30100.c diff1 | diff2 | blob | history