Merge branch 'master' of prom@party:/pub/git/u-boot-s5pc1xx
authorMinkyu Kang <mk7.kang@samsung.com>
Tue, 5 Jan 2010 02:28:46 +0000 (11:28 +0900)
committerMinkyu Kang <mk7.kang@samsung.com>
Tue, 5 Jan 2010 02:28:46 +0000 (11:28 +0900)

Trivial merge