Merge branch 'master' of prom@party:/pub/git/u-boot-s5pc1xx
authorMinkyu Kang <mk7.kang@samsung.com>
Wed, 7 Apr 2010 04:28:58 +0000 (13:28 +0900)
committerMinkyu Kang <mk7.kang@samsung.com>
Wed, 7 Apr 2010 04:28:58 +0000 (13:28 +0900)

Trivial merge