Tom Rini eeb72e6761 Merge branch 'master' of git://git.denx.de/u-boot-arm ... Conflicts: arch/arm/cpu/armv7/config.mk board/ti/am43xx/mux.c include/configs/am43xx_evm.h Signed-off-by: Tom Rini <trini@ti.com>		2014-02-26 16:49:58 -05:00
..
config.mk	kbuild: rename OBJCFLAGS to OBJCOPYFLAGS	2014-02-25 11:01:28 -05:00
cpuinfo.c	Add GPL-2.0+ SPDX-License-Identifier to source files	2013-07-24 09:44:38 -04:00
Makefile	ARM: convert makefiles to Kbuild style	2013-10-31 12:53:39 -04:00
pxa2xx.c	ARM: pxa: prevent PXA270 occasional reboot freezes	2013-12-18 16:00:37 +01:00
start.S	arm: remove unneeded symbol offsets and _TEXT_BASE	2014-02-26 21:18:12 +01:00
timer.c	ARM:PXA: Correct tick_to_time / us_to_tick to use lldiv	2013-12-13 09:16:20 -05:00
usb.c	Add GPL-2.0+ SPDX-License-Identifier to source files	2013-07-24 09:44:38 -04:00