Merge branch 'master' of git://git.denx.de/u-boot
authorStefano Babic <sbabic@denx.de>
Mon, 15 Jun 2015 10:08:11 +0000 (12:08 +0200)
committerStefano Babic <sbabic@denx.de>
Mon, 15 Jun 2015 10:08:11 +0000 (12:08 +0200)
commit212b66016120fa4cd3b8f7edbe4c9f106032884e
treef956cd9195952c7890493897a9c2108a8ee852d7
parentb31fb4b97b4d9c9fcf5a50c39d5d2c277f7008c9
parent64d16706a052553c85d2f8f4c741879a4e3e6116
Merge branch 'master' of git://git.denx.de/u-boot