u-boot-brain/arch/arm/cpu
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
..
arm720t arm720t: add back common.h include 2012-10-29 14:04:26 -07:00
arm920t arm: ks8695: use defined constants for UART 2012-10-26 23:32:11 +02:00
arm925t arm: Fixed the offset for the no relocation. 2012-10-04 16:41:15 +02:00
arm926ejs mxs: SPL: Generalize memory initialization 2012-12-07 14:50:02 +01:00
arm946es arm: Fixed the offset for the no relocation. 2012-10-04 16:41:15 +02:00
arm1136 MX35: add support for woodburn board 2012-10-26 16:27:59 +02:00
arm1176 include/linux/byteorder: import latest endian definitions from linux 2012-11-04 11:00:34 -07:00
arm_intcm arm: Fixed the offset for the no relocation. 2012-10-04 16:41:15 +02:00
armv7 Merge branch 'master' of git://git.denx.de/u-boot into master 2012-12-08 12:02:45 +01:00
ixp common: Discard the __u_boot_cmd section 2012-10-22 08:29:42 -07:00
pxa pxa: Add code to examine cpu model and revision 2012-10-15 11:54:07 -07:00
s3c44b0 arm: Fixed the offset for the no relocation. 2012-10-04 16:41:15 +02:00
sa1100 arm: Fixed the offset for the no relocation. 2012-10-04 16:41:15 +02:00
tegra20-common tegra20: initialize variable to avoid compiler warning 2012-10-29 09:07:06 -07:00
tegra-common tegra: clean up board include hell 2012-10-15 11:54:07 -07:00
u-boot.lds ARM: enhance u-boot.lds to detect over-sized SPL 2012-10-29 09:07:05 -07:00