Merge branch 'master' of git://git.denx.de/u-boot-atmel
authorTom Rini <trini@konsulko.com>
Mon, 30 Nov 2015 23:13:10 +0000 (18:13 -0500)
committerTom Rini <trini@konsulko.com>
Mon, 30 Nov 2015 23:13:10 +0000 (18:13 -0500)
commit4a421a67b6f36678bfd27b7fedc0de35faf94c76
tree18ce76f04804756a05df1e27a3d20128a8447553
parent1670c8c219f6e47de624b4ed557b5a995265cd40
parente4677f1ae221ac615f32c993aaf3d2497ad5009d
Merge branch 'master' of git://git.denx.de/u-boot-atmel