Merge branch 'master' of prom@party:/pub/git/u-boot-s5pc1xx
authorMinkyu Kang <mk7.kang@samsung.com>
Fri, 26 Feb 2010 05:16:50 +0000 (14:16 +0900)
committerMinkyu Kang <mk7.kang@samsung.com>
Fri, 26 Feb 2010 05:16:50 +0000 (14:16 +0900)

Trivial merge