Fix merge problems
authorStefan Roese <sr@denx.de>
Wed, 6 Aug 2008 12:06:03 +0000 (14:06 +0200)
committerStefan Roese <sr@denx.de>
Wed, 6 Aug 2008 12:06:03 +0000 (14:06 +0200)
commit1318673045fe188c6e24c582b1e6efc00ae1c62c
tree7d427072e01e415247c2bca9a6970e9901de66ac
parentf2302d4430e7f3f48308d6a585320fe96af8afbd
Fix merge problems

Signed-off-by: Stefan Roese <sr@denx.de>
drivers/serial/serial_xuartlite.c