Merge branch 'master' of party:/pub/git/u-boot-s5pc1xx
authorMinkyu Kang <mk7.kang@samsung.com>
Wed, 19 Jan 2011 11:41:52 +0000 (20:41 +0900)
committerMinkyu Kang <mk7.kang@samsung.com>
Wed, 19 Jan 2011 11:41:52 +0000 (20:41 +0900)

Trivial merge