Merge branch 'linus' into perf/core, to fix conflicts
[pandora-kernel.git] / drivers / spmi /
drwxr-xr-x   ..
-rw-r--r-- 708 Kconfig
-rw-r--r-- 123 Makefile
-rw-r--r-- 20761 spmi-pmic-arb.c
-rw-r--r-- 14803 spmi.c