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
..
arm	Merge branch 'master' of git://git.denx.de/u-boot into master	2012-12-08 12:02:45 +01:00
avr32	common: Discard the __u_boot_cmd section	2012-10-22 08:29:42 -07:00
blackfin	common: Discard the __u_boot_cmd section	2012-10-22 08:29:42 -07:00
m68k	ColdFire: Add MCF5441x CPU support	2012-10-24 22:27:46 +08:00
microblaze	microblaze: Fix compilation failure because of missing libdts	2012-11-08 10:33:19 +01:00
mips	Merge branch 'master' of git://git.denx.de/u-boot-mips	2012-11-27 20:34:51 -07:00
nds32	common: Discard the __u_boot_cmd section	2012-10-22 08:29:42 -07:00
nios2	nios2: remove asm/status_led.h	2012-11-10 19:45:58 +08:00
openrisc	openrisc: Change bi_baudrate and global data baudrate to int	2012-10-19 15:25:45 -07:00
powerpc	mpc5200: Add SPL support	2012-12-05 17:30:51 +01:00
sandbox	common: Discard the __u_boot_cmd section	2012-10-22 08:29:42 -07:00
sh	sh: fix trigger_address_error()	2012-11-30 15:06:04 +09:00
sparc	common: Convert the U-Boot commands to LG-arrays	2012-10-22 08:29:42 -07:00
x86	x86: Build vga video code only if CONFIG_VIDEO_VGA is defined	2012-12-06 14:30:44 -08:00
.gitignore	update include/asm/ gitignore after move	2010-05-07 00:17:30 +02:00