Merge branch 'master' of git://git.denx.de/u-boot-arm
authorWolfgang Denk <wd@denx.de>
Wed, 17 Nov 2010 19:54:39 +0000 (20:54 +0100)
committerWolfgang Denk <wd@denx.de>
Wed, 17 Nov 2010 19:54:39 +0000 (20:54 +0100)
commitd7b1970015e62d37b26bb6b94b64ae36728c63cc
tree616f994080fb1c0c204e2a77d7a2bb574ba9521d
parent8ad25bf8d9233eb7d0b614612108622a59069354
parent858ecd9ac3434e011e84d5fd9013bd1ee199dbdc
Merge branch 'master' of git://git.denx.de/u-boot-arm