aboutsummaryrefslogtreecommitdiffstats
path: root/include/asm-ia64/machvec_hpzx1.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-03-22 20:33:12 -0500
committerLinus Torvalds <torvalds@g5.osdl.org>2006-03-22 20:33:12 -0500
commit9d8f057acbd38d8177cf2ffd5e151d52c2477372 (patch)
tree1c3387b045a8a487ff99bf3abed1cdf41670f6e6 /include/asm-ia64/machvec_hpzx1.h
parent591eb85ecd7e6eb8596c6129ae074e16636b99f4 (diff)
parent91bca4b3e2f1aaaf67e62a36914f33ca1e7d5a06 (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
Diffstat (limited to 'include/asm-ia64/machvec_hpzx1.h')
0 files changed, 0 insertions, 0 deletions