Merge branch 'master' of prom@party:/pub/git/u-boot-s5pc1xx
authorMinkyu Kang <mk7.kang@samsung.com>
Thu, 3 Sep 2009 06:08:44 +0000 (15:08 +0900)
committerMinkyu Kang <mk7.kang@samsung.com>
Thu, 3 Sep 2009 06:08:44 +0000 (15:08 +0900)

Trivial merge