]> git.neil.brown.name Git - history.git/commitdiff
Merge flint.arm.linux.org.uk:/usr/src/linux-bk-2.5/linux-2.5
authorRussell King <rmk@flint.arm.linux.org.uk>
Sun, 3 Aug 2003 17:09:12 +0000 (18:09 +0100)
committerRussell King <rmk@flint.arm.linux.org.uk>
Sun, 3 Aug 2003 17:09:12 +0000 (18:09 +0100)
into flint.arm.linux.org.uk:/usr/src/linux-bk-2.5/linux-2.5-pcmcia

1  2 
drivers/pcmcia/yenta_socket.c

Simple merge