From: Wolfgang Denk <wd@denx.de>
Date: Mon, 5 Dec 2011 22:33:48 +0000 (+0100)
Subject: Merge branch 'agust@denx.de' of git://git.denx.de/u-boot-staging
X-Git-Tag: v2011.12-rc1~80
X-Git-Url: https://git.kernelconcepts.de/?p=karo-tx-uboot.git;a=commitdiff_plain;h=d194837fc3042d943ba088fcc221d534330b2872

Merge branch 'agust@denx.de' of git://git.denx.de/u-boot-staging

* 'agust@denx.de' of git://git.denx.de/u-boot-staging:
  Makefile: add tools/mkenvimage to target 'clean'
  mv_common.c: get rid of 'defined but not used' warning
  m68k: fix ambiguous bit testing
  sparc: fix unknown escape sequence warnings
  sparc: fix unused variable warnings
  sf: fix erase debug output
---

d194837fc3042d943ba088fcc221d534330b2872