]> git.sur5r.net Git - u-boot/commitdiff
projects / u-boot / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 797449a d510859)
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)
* '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


Trivial merge
Cloned from git://git.denx.de/u-boot.git