summaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-03-23 02:33:12 +0100
committerLinus Torvalds <torvalds@g5.osdl.org>2006-03-23 02:33:12 +0100
commit9d8f057acbd38d8177cf2ffd5e151d52c2477372 (patch)
tree1c3387b045a8a487ff99bf3abed1cdf41670f6e6 /drivers/net
parentMerge master.kernel.org:/home/rmk/linux-2.6-arm (diff)
parent[SERIAL] Merge avlab serial board entries in parport_serial (diff)
downloadlinux-9d8f057acbd38d8177cf2ffd5e151d52c2477372.tar.xz
linux-9d8f057acbd38d8177cf2ffd5e151d52c2477372.zip
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 'drivers/net')
0 files changed, 0 insertions, 0 deletions