Merge master.kernel.org:/pub/scm/linux/kernel/git/lenb/linux-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Tue, 12 Jul 2005 23:04:50 +0000 (16:04 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Tue, 12 Jul 2005 23:04:50 +0000 (16:04 -0700)
commit3f603ed319d5120e883e64ac5967b2fc848fc43b
tree52ef311c245e4e4cd623b546ea1daf05a5ea8911
parent55ee3b8365fd5d301b9076eea739146f2b91e82c
parent5028770a42e7bc4d15791a44c28f0ad539323807
Merge /pub/scm/linux/kernel/git/lenb/linux-2.6
drivers/pcmcia/yenta_socket.c