Merge branch 'master' of party:/pub/git/u-boot-s5pc1xx
authorKyungmin Park <kyungmin.park@samsung.com>
Tue, 12 Oct 2010 11:30:14 +0000 (20:30 +0900)
committerKyungmin Park <kyungmin.park@samsung.com>
Tue, 12 Oct 2010 11:30:14 +0000 (20:30 +0900)

Trivial merge