Merge branch 'linus' into sched/core, to resolve conflicts
[firefly-linux-kernel-4.4.55.git] / drivers / platform / chrome /
drwxr-xr-x   ..
-rw-r--r-- 1206 Kconfig
-rw-r--r-- 103 Makefile
-rw-r--r-- 12766 chromeos_laptop.c
-rw-r--r-- 2516 chromeos_pstore.c