Merge branch 'master' of git://git.denx.de/u-boot-arm
authorTom Rini <trini@ti.com>
Fri, 5 Oct 2012 20:56:45 +0000 (13:56 -0700)
committerTom Rini <trini@ti.com>
Fri, 5 Oct 2012 20:56:45 +0000 (13:56 -0700)
1  2 
MAINTAINERS

diff --cc MAINTAINERS
Simple merge