u-boot.git/Makefile, branch u-boot-2013.01.y

Prepare v2013.01.01

2013-01-31T19:47:42+00:00

Signed-off-by: Tom Rini

Prepare v2013.01

2013-01-15T21:47:42+00:00

Signed-off-by: Tom Rini

Merge branch 'master' of git://git.denx.de/u-boot-arm

2013-01-11T21:38:24+00:00

Makefile: remove MLO.byteswap on clobber

2013-01-10T22:09:24+00:00

On clobber, do a cleanup even for SPL build else, we'd have
MLO.byteswap remaining for certain platforms like am33xx SPL builds

Signed-off-by: Nishanth Menon

Prepare v2013.01-rc3

2013-01-10T21:44:40+00:00

Signed-off-by: Tom Rini

Merge samsung, imx, tegra into u-boot-arm/master

2012-12-22T10:59:14+00:00

This commit merges branches from samsung, imx and tegra
meant to fix merge issues between u-boot/master and
u-boot-arm/master, as well as a few manual merge fixes.

Merge remote-tracking branch 'u-boot/master' into u-boot-arm-merged

2012-12-19T21:02:36+00:00

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

Prepare v2013.01-rc2

2012-12-14T21:43:22+00:00

Signed-off-by: Tom Rini

Merge branch 'master' of git://git.denx.de/u-boot into resolve

2012-12-10T05:13:27+00:00

Conflicts:
	README
	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

Merge branch 'master' of git://git.denx.de/u-boot into master

2012-12-08T11:02:45+00:00

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