Merge branch 'master' of mj.ham@party:/pub/git/u-boot-s5pc1xx
authorMyungJoo Ham <MyungJoo.Ham@samsung.com>
Thu, 14 Jan 2010 09:48:06 +0000 (18:48 +0900)
committerMyungJoo Ham <MyungJoo.Ham@samsung.com>
Thu, 14 Jan 2010 09:48:06 +0000 (18:48 +0900)

Trivial merge