Merge branch 'sr@denx.de' of git://git.denx.de/u-boot-staging
authorWolfgang Denk <wd@denx.de>
Thu, 1 Dec 2011 23:05:25 +0000 (00:05 +0100)
committerWolfgang Denk <wd@denx.de>
Thu, 1 Dec 2011 23:05:25 +0000 (00:05 +0100)
commit4ebbba442587cb03590c0747fd1fea16a158f15c
tree0b6f2db3755d4deec6b7f8f69462d68b7eacba9e
parent797449a16d7f56ce1a7e38e3d85061f933b92c17
parentd510859bed4165ebf2635c74c40a037cd2819fce
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