Merge branch 'master' of prom@party:/pub/git/u-boot-s5pc1xx
authorMinkyu Kang <mk7.kang@samsung.com>
Sat, 5 Dec 2009 01:46:32 +0000 (10:46 +0900)
committerMinkyu Kang <mk7.kang@samsung.com>
Sat, 5 Dec 2009 01:46:32 +0000 (10:46 +0900)

Trivial merge