[U-Boot] Please pull u-boot-staging/sr at denx.de

[Wolfgang Denk]

Dear Stefan Roese,

In message <201112011003.24451.sr at denx.de> you wrote:
> On Thursday 01 December 2011 10:00:01 Stefan Roese wrote:
> > Hi Wolfgang,
> > 
> > I applied the two patche from Stephen to my staging branch.
> > Please feel free to pull them. Thanks.
> 
> Uuups. I hit "Send button" too early. Here the missing diff-log:
> 
> 
> The following changes since commit a63d9652757605ec5f7104addc5d38bf10ba8671:
> 
>   menu.c: use puts() instead of printf() where possible (2011-11-28 20:19:41 +0100)
> 
> are available in the git repository at:
>   git://www.denx.de/git/u-boot-staging.git sr at denx.de
> 
> Stephen Warren (2):
>       image: Implement IH_TYPE_KERNEL_NOLOAD
>       image: Don't detect XIP images as overlapping.
> 
>  common/cmd_bootm.c    |   14 ++++++++++++--
>  common/image.c        |    1 +
>  include/image.h       |    1 +
>  tools/default_image.c |    3 ++-
>  4 files changed, 16 insertions(+), 3 deletions(-)

Applied, thanks.

Best regards,

Wolfgang Denk

-- 
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
Cogito cogito ergo cogito sum - "I think that I  think,  therefore  I
think that I am."          - Ambrose Bierce, "The Devil's Dictionary"