Merge branch 'for-next/regulator'
Conflicts:
	commands/Makefile
commit 845f765b6e7f5830b14c7910203d271c43e6af6a
2 parents 9bb7688 + acb427e
@Sascha Hauer Sascha Hauer authored on 5 May 2014
Showing 12 changed files
View
commands/Kconfig
View
commands/Makefile
View
commands/regulator.c 0 → 100644
View
drivers/Kconfig
View
drivers/Makefile
View
drivers/mci/mci-core.c
View
drivers/regulator/Kconfig 0 → 100644
View
drivers/regulator/Makefile 0 → 100644
View
drivers/regulator/core.c 0 → 100644
View
drivers/regulator/fixed.c 0 → 100644
View
include/mci.h
View
include/regulator.h 0 → 100644