Merge branch 'master' of kmpark@party:/pub/git/u-boot-s5pc1xx
authorKyungmin Park <kyungmin.park@samsung.com>
Sat, 6 Feb 2010 01:04:23 +0000 (10:04 +0900)
committerKyungmin Park <kyungmin.park@samsung.com>
Sat, 6 Feb 2010 01:04:23 +0000 (10:04 +0900)

Trivial merge