Merge branch 'master' of git://git.denx.de/u-boot-atmel
authorTom Rini <trini@ti.com>
Tue, 10 Feb 2015 15:42:22 +0000 (10:42 -0500)
committerTom Rini <trini@ti.com>
Tue, 10 Feb 2015 15:42:22 +0000 (10:42 -0500)
commitc956662cc3e2475b451afa9a8b639c0ccc49d432
tree3e799e9dded7ba103544de55d6d54c6c5f98b6da
parent0dac731d1932027f4f813ec7aede35d5e30dec0e
parent657006a1c46f11784757f9437ffaaa5e0c4dea72
Merge branch 'master' of git://git.denx.de/u-boot-atmel
arch/arm/Kconfig
common/board_f.c
drivers/video/atmel_lcdfb.c