Merge branch 'master' of git://git.denx.de/u-boot
authorKim Phillips <[email protected]>
Mon, 23 Feb 2009 21:42:44 +0000 (15:42 -0600)
committerKim Phillips <[email protected]>
Mon, 23 Feb 2009 21:42:44 +0000 (15:42 -0600)

Trivial merge