diff options
author | Stefano Babic <sbabic@denx.de> | 2014-04-04 09:35:30 (GMT) |
---|---|---|
committer | Stefano Babic <sbabic@denx.de> | 2014-04-04 09:35:30 (GMT) |
commit | 1cad23c5f471d695bed1e3907e30caee3c2a3056 (patch) | |
tree | 34e035df5db9b327aeae36eff9d0645a915e3177 /arch/arm/include/asm/arch-tegra/timer.h | |
parent | 5dd73bc0a40a4b318195eab871a1f535aad6b43b (diff) | |
parent | 00b132bf34c5be86a108ac7fe8231ad9e97f6de4 (diff) | |
download | u-boot-1cad23c5f471d695bed1e3907e30caee3c2a3056.tar.xz |
Merge branch 'master' of git://git.denx.de/u-boot-arm into master
Conflicts:
arch/arm/cpu/arm926ejs/mxs/mxsimage.mx23.cfg
arch/arm/cpu/arm926ejs/mxs/mxsimage.mx28.cfg
Signed-off-by: Stefano Babic <sbabic@denx.de>
Diffstat (limited to 'arch/arm/include/asm/arch-tegra/timer.h')
0 files changed, 0 insertions, 0 deletions