aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/pcmcia
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-02-28 23:57:20 -0500
committerLinus Torvalds <torvalds@g5.osdl.org>2006-02-28 23:57:20 -0500
commit96789ac4b3943fec27fb6bf2713633b01a3903ad (patch)
tree5fa9dce4561072e64e460c8d920851a63a3b0b98 /drivers/pcmcia
parent77eebf346dfe87587ee8a54c76349a996e80c24f (diff)
parent958ddb75b04b792c701b2b08acdb200d638abf4e (diff)
Merge branch 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
Diffstat (limited to 'drivers/pcmcia')
0 files changed, 0 insertions, 0 deletions