Merge branch 'master' of prom@party:/pub/git/u-boot-s5pc1xx
authorMinkyu Kang <mk7.kang@samsung.com>
Fri, 2 Apr 2010 00:58:22 +0000 (09:58 +0900)
committerMinkyu Kang <mk7.kang@samsung.com>
Fri, 2 Apr 2010 00:58:22 +0000 (09:58 +0900)

Trivial merge