Merge branch 'master' of prom@party:/pub/git/u-boot-s5pc1xx
authorMinkyu Kang <mk7.kang@samsung.com>
Thu, 23 Jul 2009 08:26:41 +0000 (17:26 +0900)
committerMinkyu Kang <mk7.kang@samsung.com>
Thu, 23 Jul 2009 08:26:41 +0000 (17:26 +0900)

Trivial merge