Merge branch 'master' of daeinki@10.89.8.158:/pub/git/u-boot-s5pc1xx
authordaeinki <inki.dae@samsung.com>
Tue, 19 Jan 2010 01:57:45 +0000 (10:57 +0900)
committerdaeinki <inki.dae@samsung.com>
Tue, 19 Jan 2010 01:57:45 +0000 (10:57 +0900)

Trivial merge