Merge branch 'master' of git://git.denx.de/u-boot
authorKim Phillips <kim.phillips@freescale.com>
Fri, 15 Feb 2013 23:46:50 +0000 (17:46 -0600)
committerKim Phillips <kim.phillips@freescale.com>
Fri, 15 Feb 2013 23:46:50 +0000 (17:46 -0600)

Trivial merge