Merge branch 'master' of prom@party:/pub/git/u-boot-s5pc1xx
authorMinkyu Kang <mk7.kang@samsung.com>
Fri, 7 Aug 2009 08:46:22 +0000 (17:46 +0900)
committerMinkyu Kang <mk7.kang@samsung.com>
Fri, 7 Aug 2009 08:46:22 +0000 (17:46 +0900)

Trivial merge