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

Trivial merge