Merge branch 'master' of prom@party:/pub/git/u-boot-s5pc1xx
authorMinkyu Kang <mk7.kang@samsung.com>
Mon, 2 Nov 2009 10:21:53 +0000 (19:21 +0900)
committerMinkyu Kang <mk7.kang@samsung.com>
Mon, 2 Nov 2009 10:21:53 +0000 (19:21 +0900)

Trivial merge