Greg Kroah-Hartman a769f30c7b 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>		2017-02-06 09:36:10 +01:00
..
chrome	iio: cros_ec: Add cros_ec barometer driver	2017-01-28 15:07:46 +00:00
goldfish	platform: goldfish: pipe: use get_user_pages_unlocked()	2016-11-10 15:34:56 +01:00
mips	Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus	2016-05-19 10:02:26 -07:00
olpc	platform/olpc: Make ec explicitly non-modular	2016-08-28 22:31:52 -07:00
x86	platform/x86: ideapad-laptop: handle ACPI event 1	2017-01-22 12:47:06 +02:00
Kconfig	goldfish: refactor goldfish platform configs	2016-01-28 23:34:36 -08:00
Makefile	MIPS: Loongson-3: Add CPU Hwmon platform driver	2015-04-01 17:22:17 +02:00