From: Wolfgang Denk <wd@denx.de>
Date: Thu, 1 Dec 2011 23:05:25 +0000 (+0100)
Subject: Merge branch 'sr@denx.de' of git://git.denx.de/u-boot-staging
X-Git-Tag: v2011.12-rc1~106^2~14
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=4ebbba442587cb03590c0747fd1fea16a158f15c;p=oweals%2Fu-boot.git

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
---

4ebbba442587cb03590c0747fd1fea16a158f15c