summaryrefslogtreecommitdiff
path: root/include/configs/spear6xx.h
diff options
context:
space:
mode:
authorMinkyu Kang <mk7.kang@samsung.com>2010-03-23 19:09:13 +0900
committerMinkyu Kang <mk7.kang@samsung.com>2010-03-23 19:09:13 +0900
commit45e565337a90bbca0c1bb712b5e008b7c0b18bd5 (patch)
tree8bcaee16cda9d8f90f5b596566ad2122c6d8d86b /include/configs/spear6xx.h
parent995a4b1d83a08223c82c1e15778b02e85e5bba51 (diff)
parentd650da2dd4af99967aabc43cccbd8f160eb4cea6 (diff)
downloadu-boot-imx-45e565337a90bbca0c1bb712b5e008b7c0b18bd5.zip
u-boot-imx-45e565337a90bbca0c1bb712b5e008b7c0b18bd5.tar.gz
u-boot-imx-45e565337a90bbca0c1bb712b5e008b7c0b18bd5.tar.bz2
Merge branch 'master' of git://git.denx.de/u-boot-arm
Conflicts: cpu/arm920t/ep93xx/timer.c Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>
Diffstat (limited to 'include/configs/spear6xx.h')
-rw-r--r--[-rwxr-xr-x]include/configs/spear6xx.h0
1 files changed, 0 insertions, 0 deletions
diff --git a/include/configs/spear6xx.h b/include/configs/spear6xx.h
index 2ad5beb..2ad5beb 100755..100644
--- a/include/configs/spear6xx.h
+++ b/include/configs/spear6xx.h