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
..
amcc	ppc4xx: Canyonlands/Glacier: Squeeze NAND image a bit to fit again	2012-09-03 11:29:07 +02:00
freescale	Merge branch 'master' of git://git.denx.de/u-boot into master	2012-12-08 12:02:45 +01:00
karo/tx25	nand_spl: fix u-boot.lst breakage	2012-11-14 10:26:23 +01:00
samsung/smdk6400	common: Discard the __u_boot_cmd section	2012-10-22 08:29:42 -07:00
sheldon/simpc8313	Fix build issues cause by LDFLAGS_FINAL changes	2011-03-31 23:38:16 +02:00