Albert ARIBAUD 19d829fa60 Merge branch 'u-boot-imx/master' into 'u-boot-arm/master' ...

Conflicts:
	drivers/serial/serial.c

The conflict above was a trivial case of adding one init
function in each branch, and manually resolved in merge.

2013-09-05 11:15:26 +02:00

..

cpu

Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'

2013-09-05 11:15:26 +02:00

dts

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

2013-07-12 10:36:48 -04:00

imx-common

Merge git://git.denx.de/u-boot-arm

2013-07-31 11:30:38 +02:00

include/asm

Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'

2013-09-05 11:15:26 +02:00

lib

arm: spl: For Falcon Mode, set a default machid of ~0

2013-08-15 18:38:35 -04:00

config.mk

ARM: OMAP: Add CONFIG_OMAP_COMMON

2013-08-15 08:51:10 -04:00