Merge branch 'master' of mj.ham@party:/pub/git/u-boot-s5pc1xx
authorMyungJoo Ham <MyungJoo.Ham@samsung.com>
Fri, 4 Dec 2009 01:06:14 +0000 (10:06 +0900)
committerMyungJoo Ham <MyungJoo.Ham@samsung.com>
Fri, 4 Dec 2009 01:06:14 +0000 (10:06 +0900)
commit2c5da1507a835db51d3dc9d000e8c835788a8b9e
tree682bc5b54769b6136a391123b32cb917f13078c3
parent89aac624300488ac6b1ade91a21f453b3e82ca77
parenta865b1b389f7ab75a669e614fc95c1dfbb5b2015
Merge branch 'master' of mj.ham@party:/pub/git/u-boot-s5pc1xx

Conflicts:
board/samsung/universal/universal.c
board/samsung/universal/universal.c