Merge branch 'master' of git://git.denx.de/u-boot-nios
authorTom Rini <trini@ti.com>
Fri, 6 Sep 2013 13:37:04 +0000 (09:37 -0400)
committerTom Rini <trini@ti.com>
Fri, 6 Sep 2013 13:37:04 +0000 (09:37 -0400)
commit938138c70815ce5abd5d61b01d28fbb3d618db48
tree58de17af72dd1b98de4d0b3697a17f61dc6b3d5b
parent3c950c4fca1774f55e0941fc3d0f762c23a0b1c1
parent1a05b5f91e12845cf06f4b1ef34096861bf718b5
Merge branch 'master' of git://git.denx.de/u-boot-nios