]> git.hungrycats.org Git - linux/commit
Merge bk://bk.arm.linux.org.uk/linux-2.5-pcmcia
authorLinus Torvalds <torvalds@home.osdl.org>
Sun, 17 Aug 2003 04:42:52 +0000 (21:42 -0700)
committerLinus Torvalds <torvalds@home.osdl.org>
Sun, 17 Aug 2003 04:42:52 +0000 (21:42 -0700)
commit03edef3c8405836750e1482e175d01a954cf687d
tree0d105b5041a93d0033ec1096e3d3cf544c24723e
parente8a3edfcc3a013fc93461c78255cfdcdc6283be0
parent6e8e9d8023445b441fbccbe6852a393eb3e47b89
Merge bk://bk.arm.linux.org.uk/linux-2.5-pcmcia
into home.osdl.org:/home/torvalds/v2.5/linux
drivers/net/wireless/atmel_cs.c