git.stricted.de - GitHub/MotorolaMobilityLLC/kernel-slsi.git/commit

projects / GitHub / MotorolaMobilityLLC / kernel-slsi.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 591eb85 91bca4b)

author	Linus Torvalds <torvalds@g5.osdl.org>
	Thu, 23 Mar 2006 01:33:12 +0000 (17:33 -0800)
committer	Linus Torvalds <torvalds@g5.osdl.org>
	Thu, 23 Mar 2006 01:33:12 +0000 (17:33 -0800)
commit	9d8f057acbd38d8177cf2ffd5e151d52c2477372
tree	1c3387b045a8a487ff99bf3abed1cdf41670f6e6	tree \| snapshot (tar.gz zip)
parent	591eb85ecd7e6eb8596c6129ae074e16636b99f4	commit \| diff
parent	91bca4b3e2f1aaaf67e62a36914f33ca1e7d5a06	commit \| diff

Merge master.kernel.org:/home/rmk/linux-2.6-serial

* master.kernel.org:/home/rmk/linux-2.6-serial:
[SERIAL] Merge avlab serial board entries in parport_serial
[SERIAL] kernel console should send CRLF not LFCR

drivers/serial/s3c2410.c	diff1 \|	diff2 \|	blob \| history
drivers/serial/serial_txx9.c	diff1 \|	diff2 \|	blob \| history
drivers/serial/sunsab.c	diff1 \|	diff2 \|	blob \| history
drivers/serial/sunsu.c	diff1 \|	diff2 \|	blob \| history
drivers/serial/sunzilog.c	diff1 \|	diff2 \|	blob \| history
drivers/serial/vr41xx_siu.c	diff1 \|	diff2 \|	blob \| history
include/linux/serial_core.h	diff1 \|	diff2 \|	blob \| history

Motorola kernel-slsi