Allen Martin a098cf41fd Merge remote-tracking branch 'u-boot/master' into u-boot-arm-merged ...

Conflicts:
	README
	arch/arm/cpu/armv7/exynos/clock.c
	board/samsung/universal_c210/universal.c
	drivers/misc/Makefile
	drivers/power/power_fsl.c
	include/configs/mx35pdk.h
	include/configs/mx53loco.h
	include/configs/seaboard.h

2012-12-19 13:02:36 -08:00

..

battery.h

…

fg_battery_cell_params.h

…

max8997_muic.h

…

max8997_pmic.h

…

max8998_pmic.h

…

max17042_fg.h

…

max77686_pmic.h

…

pmic.h

…

power_chrg.h

…