Merge branch 'master' of prom@party:/pub/git/u-boot-s5pc1xx
authorMinkyu Kang <mk7.kang@samsung.com>
Mon, 25 Jan 2010 10:02:54 +0000 (19:02 +0900)
committerMinkyu Kang <mk7.kang@samsung.com>
Mon, 25 Jan 2010 10:02:54 +0000 (19:02 +0900)

Trivial merge