Greg Kroah-Hartman bb27d4998a Merge char-misc-next into staging-next ... This resolves the merge issues and confusions people were having with the goldfish drivers due to changes for them showing up in two different trees. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>		2016-02-22 14:46:24 -08:00
..
chrome	platform/chrome: Fix i2c-designware adapter name	2015-11-09 19:43:33 -08:00
goldfish	Merge char-misc-next into staging-next	2016-02-22 14:46:24 -08:00
mips	MIPS: Loongson-3: Add chipset ACPI platform driver	2015-04-01 17:22:18 +02:00
olpc	OLPC: Use %*ph specifier instead of passing direct values	2015-10-06 23:22:08 +01:00
x86	intel_scu_ipcutil: underflow in scu_reg_access()	2016-01-30 09:40:35 -08: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