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
..
am35x_musb.c	Coding Style cleanup: remove trailing empty lines	2013-10-14 16:06:54 -04:00
board.c	Merge git://git.denx.de/u-boot-dm	2014-10-26 14:03:08 -04:00
clock.c	ARM: OMAP: replace custom sr32() by standard I/O accessors	2014-04-17 14:39:54 -04:00
config.mk	kbuild: use shorten logs for mkimage rules	2014-02-25 11:01:29 -05:00
emac.c	Add GPL-2.0+ SPDX-License-Identifier to source files	2013-07-24 09:44:38 -04:00
emif4.c	omap3: make local functions static	2014-10-25 07:02:02 -04:00
Kconfig	kconfig: remove redundant "string" type in arch and board Kconfigs	2014-09-13 16:43:55 -04:00
lowlevel_init.S	arm: remove unneeded symbol offsets and _TEXT_BASE	2014-02-26 21:18:12 +01:00
Makefile	ARM: omap: merge GPMC initialization code for all platform	2014-05-23 19:39:36 -04:00
sdrc.c	Add GPL-2.0+ SPDX-License-Identifier to source files	2013-07-24 09:44:38 -04:00
spl_id_nand.c	Add GPL-2.0+ SPDX-License-Identifier to source files	2013-07-24 09:44:38 -04:00
sys_info.c	omap3: board: add missing include and proto	2014-10-25 15:27:35 -04:00