Merge branch 'master' into next
authorWolfgang Denk <wd@denx.de>
Wed, 23 Jun 2010 19:17:29 +0000 (21:17 +0200)
committerWolfgang Denk <wd@denx.de>
Wed, 23 Jun 2010 19:17:29 +0000 (21:17 +0200)
commitf35f3968c21bc8d01958ad1f92fe30e6ccc9c318
tree2d10d82ec489f225d58b185cf463a4f62ad45ed3
parent54e19a7ded6e9dbdc3392a57d82f4f77b34e85b8
parent482126e27b3dbf0e69a6445da8b94b3551adf05d
Merge branch 'master' into next
Makefile