Merge branch 'master' of git://git.denx.de/u-boot-blackfin
authorWolfgang Denk <wd@denx.de>
Mon, 21 Nov 2011 21:04:17 +0000 (22:04 +0100)
committerWolfgang Denk <wd@denx.de>
Mon, 21 Nov 2011 21:04:17 +0000 (22:04 +0100)
commit74faaf96564e6d60fb436e0c1f9e502b778fe9ec
tree268c3f4394dd33ff4ad4588451ed6524fd90cc81
parent3bf03add545f8988f2fef64b7975beb4ec8bf99f
parente29ad970f10c68f93c900810ee184ccf0cee7d91
Merge branch 'master' of git://git.denx.de/u-boot-blackfin

* 'master' of git://git.denx.de/u-boot-blackfin:
  Blackfin: cache result of cpp check
  Blackfin: traps: fix up printf warnings from debug
  Blackfin: drop now unused local variable