summaryrefslogtreecommitdiffstats
path: root/drivers/net/pcmcia
diff options
context:
space:
mode:
authorJeff Garzik <jeff@garzik.org>2006-05-28 16:35:13 -0400
committerJeff Garzik <jeff@garzik.org>2006-05-28 16:35:13 -0400
commitb53471711f21ba0e151075f0e1d6d531eb50f1b1 (patch)
treee912dbe14b6af76b0ebe853a9976c99616bb8a4c /drivers/net/pcmcia
parent983f27d37d4fc72c252835cb2ee3103b360735a6 (diff)
parent83055d46e5eddbb3574ef5e9c0d9c021bcb75c0b (diff)
Merge branch 'velocity' of git://electric-eye.fr.zoreil.com/home/romieu/linux-2.6 into upstream
Diffstat (limited to 'drivers/net/pcmcia')
0 files changed, 0 insertions, 0 deletions