Tom Rini 84a6df09c7 Merge git://git.denx.de/u-boot-dm ... Fix a trivial conflict over adding <dm.h> Conflicts: arch/arm/cpu/armv7/omap3/board.c Signed-off-by: Tom Rini <trini@ti.com>		2014-10-26 14:03:08 -04:00
..
cpu	Merge git://git.denx.de/u-boot-dm	2014-10-26 14:03:08 -04:00
dts	dm: dts: Move omap device tree includes to correct place	2014-10-23 19:30:51 -06:00
imx-common	imx: add missing includes	2014-10-25 15:27:35 -04:00
include/asm	Merge git://git.denx.de/u-boot-dm	2014-10-26 14:03:08 -04:00
lib	arm: vectors: provide protypes from vectors.S	2014-10-25 15:27:36 -04:00
mvebu-common	arm: kirkwood: Change naming of dram functions from km_foo() to mvebu_foo()	2014-10-23 09:59:21 -04:00
config.mk	kconfig: delete redundant CONFIG_${ARCH} definition	2014-07-30 14:42:02 -04:00
Kconfig	arm: armada-xp: Add basic support for the maxBCM board	2014-10-23 09:59:21 -04:00