summaryrefslogtreecommitdiff
path: root/include/configs
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2010-03-21 21:45:36 (GMT)
committerWolfgang Denk <wd@denx.de>2010-03-21 21:45:36 (GMT)
commitb46b353b901a45ebe860f8bf874ca99f018cd410 (patch)
treee2d42c0f36b9d7b67c1a17fe97f4734552370a6b /include/configs
parent3c950e2ebfde083084cc926b020e3a22a536bf85 (diff)
parentdaa989b47297c9f73426783599c286ef3a1f3f49 (diff)
downloadu-boot-fsl-qoriq-b46b353b901a45ebe860f8bf874ca99f018cd410.tar.xz
Merge remote branch 'origin/master' into next
Diffstat (limited to 'include/configs')
-rw-r--r--[-rwxr-xr-x]include/configs/spear3xx.h0
-rw-r--r--[-rwxr-xr-x]include/configs/spear6xx.h0
2 files changed, 0 insertions, 0 deletions
diff --git a/include/configs/spear3xx.h b/include/configs/spear3xx.h
index 0248aba..0248aba 100755..100644
--- a/include/configs/spear3xx.h
+++ b/include/configs/spear3xx.h
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