Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-11-12 16:07:30 +00:00
Code Issues Projects Releases Packages Wiki Activity
u-boot/arch/arm
History
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
..
cpu Merge branch 'master' of git://git.denx.de/u-boot into master 2012-12-08 12:02:45 +01:00
dts tegra: fdt: Add NAND controller binding and definitions 2012-09-07 13:54:30 -07:00
imx-common imx-common: cpu: add imx_ddr_size 2012-11-10 08:15:40 +01:00
include/asm Merge branch 'master' of git://git.denx.de/u-boot into master 2012-12-08 12:02:45 +01:00
lib pmic: Introduce power_init_board() method at ./lib/board.c file 2012-11-14 11:21:09 +01:00
config.mk arm: work around assembler bug 2012-10-04 14:19:04 +02:00