Fix merge problems
[platform/kernel/u-boot.git] / drivers / serial / s3c4510b_uart.c
2008-08-06 Stefan RoeseFix merge problems
2008-01-09 Markus KlotzbuecherMerge git://www.denx.de/git/u-boot
2008-01-08 Wolfgang DenkMerge branch 'inka4x0-ng' of /home/m8/git/u-boot/
2008-01-07 Peter PearseMerge with git://www.denx.de/git/u-boot.git
2007-12-11 Stefan RoeseMerge commit 'u-boot/master' into for-1.3.1
2007-12-06 Jon LoeligerMerge commit 'wd/master'
2007-12-06 Nobuhiro IwamatsuMerge git://www.denx.de/git/u-boot
2007-11-26 Wolfgang DenkMerge commit '87ddedd'
2007-11-25 Jean-Christophe... drivers/serial : move serial drivers to drivers/serial