Stefano Babic 05a860c228 Merge branch 'master' of git://git.denx.de/u-boot into master ... Conflicts: drivers/power/power_fsl.c include/configs/mx35pdk.h include/configs/mx53loco.h include/configs/woodburn_common.h board/woodburn/woodburn.c These boards still use the old old PMIC framework, so they do not merge properly after the power framework was merged into mainline. Fix all conflicts and update woodburn to use Power Framework. Signed-off-by: Stefano Babic <sbabic@denx.de>		2012-12-08 12:02:45 +01:00
..
battery	pmic🔋 Support for Trats Battery at PMIC framework	2012-11-14 11:21:10 +01:00
fuel_gauge	pmic:fuel-gauge: Support for MAX17042 fuel-gauge	2012-11-14 11:21:10 +01:00
pmic	power:pmic: Rename CONFIG_PMIC* defines to CONFIG_POWER	2012-11-14 11:21:12 +01:00
ftpmu010.c	ftpmu010: fix relocation and enhance features	2011-04-27 19:38:08 +02:00
Makefile	power:pmic: Rename CONFIG_DIALOG_PMIC defines to CONFIG_DIALOG_POWER	2012-11-14 11:21:12 +01:00
power_core.c	power:pmic: Rename ./drivers/power/pmic_* to ./drivers/power/power_* files	2012-11-14 11:21:12 +01:00
power_dialog.c	power:pmic: Rename ./drivers/power/pmic_* to ./drivers/power/power_* files	2012-11-14 11:21:12 +01:00
power_fsl.c	Merge branch 'master' of git://git.denx.de/u-boot into master	2012-12-08 12:02:45 +01:00
power_i2c.c	power:pmic: Rename ./drivers/power/pmic_* to ./drivers/power/power_* files	2012-11-14 11:21:12 +01:00
power_spi.c	power:pmic: Rename ./drivers/power/pmic_* to ./drivers/power/power_* files	2012-11-14 11:21:12 +01:00
tps6586x.c	i2c: Add TPS6586X driver	2012-05-15 08:31:37 +02:00
twl4030.c	twl4030: fix potential power supply handling issues	2012-03-27 22:05:29 +02:00
twl6030.c	mmc: omap: config VMMC, MMC1_PBIAS	2011-09-30 22:00:55 +02:00
twl6035.c	omap5: pbias ldo9 turn on	2012-05-15 08:31:25 +02:00