Merge branch 'u-boot-atmel/master' into 'u-boot-arm/master'
authorAlbert ARIBAUD <albert.u.boot@aribaud.net>
Tue, 5 Nov 2013 19:50:39 +0000 (20:50 +0100)
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>
Tue, 5 Nov 2013 19:50:39 +0000 (20:50 +0100)
commitc0e5dd88c438a41bf180dde0c2dc4c67dcd8058d
treeda81a7a9b2616bfb0db1331089b390c7c92af247
parentf6723794fd8f3362c4f3b5d0f36607a6a6f107b2
parentc12f941bece9ed79efccfe9e4a9fd977da6975f9
Merge branch 'u-boot-atmel/master' into 'u-boot-arm/master'