summaryrefslogtreecommitdiffstats
path: root/net/socket.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-03-28 13:52:37 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2006-03-28 13:52:37 -0800
commitd4965b3e2ff94d0c7b7e6e7e9794b54950a2f4b9 (patch)
treee96e7a3e02acacd4ee200592ec176b94802d11e7 /net/socket.c
parent9561b03dc360068504cb296d325fb84295f91fbb (diff)
parentaee85fe8e8143d3f54d9e6d3c6cdd40ead563267 (diff)
downloadblackbird-op-linux-d4965b3e2ff94d0c7b7e6e7e9794b54950a2f4b9.tar.gz
blackbird-op-linux-d4965b3e2ff94d0c7b7e6e7e9794b54950a2f4b9.zip
Merge master.kernel.org:/home/rmk/linux-2.6-serial
* master.kernel.org:/home/rmk/linux-2.6-serial: [SERIAL] Provide Cirrus EP93xx AMBA PL010 serial support. [SERIAL] amba-pl010: allow platforms to specify modem control method [SERIAL] Remove obsoleted au1x00_uart driver [SERIAL] Small time UART configuration fix for AU1100 processor
Diffstat (limited to 'net/socket.c')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud