| commit | 5c8929d5bacc099d58d9e092322e33657374d499 | [log] [tgz] |
|---|---|---|
| author | Wolfgang Denk <wd@denx.de> | Fri Dec 02 00:05:25 2011 +0100 |
| committer | Wolfgang Denk <wd@denx.de> | Fri Dec 02 00:05:25 2011 +0100 |
| tree | 0b6f2db3755d4deec6b7f8f69462d68b7eacba9e | |
| parent | 52940988890af53221df0a65f97ca4b171e15728 [diff] | |
| parent | f66131d67cd6be4148f8cf2b18e964a2d292f75d [diff] |
Merge branch 'sr@denx.de' of git://git.denx.de/u-boot-staging * 'sr@denx.de' of git://git.denx.de/u-boot-staging: image: Don't detect XIP images as overlapping. image: Implement IH_TYPE_KERNEL_NOLOAD