tree 0b6f2db3755d4deec6b7f8f69462d68b7eacba9e
parent 52940988890af53221df0a65f97ca4b171e15728
parent f66131d67cd6be4148f8cf2b18e964a2d292f75d
author Wolfgang Denk <wd@denx.de> 1322780725 +0100
committer Wolfgang Denk <wd@denx.de> 1322780725 +0100

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