Merge branch 'master' of minjames@party:/pub/git/u-boot-s5pc1xx
authorByungho Min <bhmin@samsung.com>
Thu, 21 Jan 2010 08:28:26 +0000 (17:28 +0900)
committerByungho Min <bhmin@samsung.com>
Thu, 21 Jan 2010 08:28:26 +0000 (17:28 +0900)

Trivial merge