Merge branch 'master' of git://git.denx.de/u-boot-sh
authorTom Rini <trini@ti.com>
Fri, 30 Nov 2012 14:15:27 +0000 (07:15 -0700)
committerTom Rini <trini@ti.com>
Fri, 30 Nov 2012 14:15:27 +0000 (07:15 -0700)
commitb04eb342af72d5dbcc29ccd7f3f9475044113361
treefb236d495c2dfe2a2cacf93a9b5ef09ddf52d841
parentf3269ad4e8faa4e9803245dd13ef0dc83f0339fc
parent7c791b3f0a8e42f8012f782ef56ad6e88858e7c4
Merge branch 'master' of git://git.denx.de/u-boot-sh