Merge branch 'master' of git://git.denx.de/u-boot-nios
authorTom Rini <trini@ti.com>
Sun, 31 Aug 2014 11:45:55 +0000 (07:45 -0400)
committerTom Rini <trini@ti.com>
Sun, 31 Aug 2014 11:45:55 +0000 (07:45 -0400)
commit0a64bc20f7f160904d3795536ec70446ad743826
treeb8187d17273524de0d6d9b8f3ae7958aab2b2ae1
parent16e16fdde21c9255e338d2eaea339c3ca905da22
parent857b9cb69ffc2b5a607e55a09325290274c7272e
Merge branch 'master' of git://git.denx.de/u-boot-nios