Merge branch 'u-boot/master' into 'u-boot-arm/master'
authorAlbert ARIBAUD <albert.u.boot@aribaud.net>
Fri, 10 Oct 2014 23:20:30 +0000 (01:20 +0200)
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>
Fri, 10 Oct 2014 23:20:30 +0000 (01:20 +0200)
commit790af815436bc6a93e4c581840be2419897f23b1
tree1ba0aaacad86092aea67d3612ae066b33b117619
parentd0b3723034aa865b8618428739efe1d98b1a2e2b
parentdb67801bf92f7fae6131dbc0d387131698fb9490
Merge branch 'u-boot/master' into 'u-boot-arm/master'