linux-uconsole/drivers/platform
Alex Shi 5f87c475f8 Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android
Conflicts:
	in fs/proc/task_mmu.c:
	looks like vma_get_anon_name() want have a name for anonymous
	vma when there is no name used in vma. commit: 586278d78b
	The name show is after any other names, so it maybe covered.
	but anyway, it just a show here.
2016-09-20 15:18:54 +08:00
..
chrome mfd: cros_ec: Add cros_ec_cmd_xfer_status() helper 2016-09-07 08:32:43 +02:00
goldfish goldfish_bus: switch GOLDFISH_BUS config back to bool 2016-02-16 13:54:22 -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 hp-wmi: Fix wifi cannot be hard-unblocked 2016-08-20 18:09:19 +02:00
Kconfig Enable adb with android-pipe in IA image 2016-02-16 13:54:21 -08:00
Makefile MIPS: Loongson-3: Add CPU Hwmon platform driver 2015-04-01 17:22:17 +02:00