Merge branch 'master' of git://git.denx.de/u-boot-mips
authorTom Rini <trini@ti.com>
Wed, 12 Dec 2012 13:51:02 +0000 (06:51 -0700)
committerTom Rini <trini@ti.com>
Wed, 12 Dec 2012 13:51:02 +0000 (06:51 -0700)
commitcaddc17f3019a437b972cd04a8c9a9cbea344def
tree53d68071b396fb150503cc0f5ae94e54875032d0
parentbf3d58bb7dc5dd4a2b15dd20663040ef43c5f795
parentf88e09de8d4ce7307c6aaf3a3adff53e85b4b5b3
Merge branch 'master' of git://git.denx.de/u-boot-mips