Merge branch 'master' of prom@party:/pub/git/u-boot-s5pc1xx
authorMinkyu Kang <mk7.kang@samsung.com>
Fri, 18 Sep 2009 07:21:14 +0000 (16:21 +0900)
committerMinkyu Kang <mk7.kang@samsung.com>
Fri, 18 Sep 2009 07:21:14 +0000 (16:21 +0900)

Trivial merge