diff options
author | Wolfgang Denk <wd@denx.de> | 2010-03-21 22:45:36 +0100 |
---|---|---|
committer | Wolfgang Denk <wd@denx.de> | 2010-03-21 22:45:36 +0100 |
commit | b46b353b901a45ebe860f8bf874ca99f018cd410 (patch) | |
tree | e2d42c0f36b9d7b67c1a17fe97f4734552370a6b /lib_m68k/bootm.c | |
parent | 3c950e2ebfde083084cc926b020e3a22a536bf85 (diff) | |
parent | daa989b47297c9f73426783599c286ef3a1f3f49 (diff) | |
download | u-boot-imx-b46b353b901a45ebe860f8bf874ca99f018cd410.zip u-boot-imx-b46b353b901a45ebe860f8bf874ca99f018cd410.tar.gz u-boot-imx-b46b353b901a45ebe860f8bf874ca99f018cd410.tar.bz2 |
Merge remote branch 'origin/master' into next
Diffstat (limited to 'lib_m68k/bootm.c')
-rw-r--r--[-rwxr-xr-x] | lib_m68k/bootm.c | 0 |
1 files changed, 0 insertions, 0 deletions
diff --git a/lib_m68k/bootm.c b/lib_m68k/bootm.c index e5ed6eb..e5ed6eb 100755..100644 --- a/lib_m68k/bootm.c +++ b/lib_m68k/bootm.c |