Merge branch 'master' of git://git.denx.de/u-boot-coldfire
authorWolfgang Denk <wd@denx.de>
Fri, 28 May 2010 17:49:12 +0000 (19:49 +0200)
committerWolfgang Denk <wd@denx.de>
Fri, 28 May 2010 17:49:12 +0000 (19:49 +0200)
commit35269d3fca60b5f73113b0443c8e40070749c1d9
treea9b92fede972c3e0411304288a4c4b620d1f108e
parent6e85d07a857148405b1c52c86d97200c7155c3f2
parentadf55679af1ed98c15a136eb81d6204ebe740b30
Merge branch 'master' of git://git.denx.de/u-boot-coldfire