Merge branch 'upstream-net26' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
[safe/jmp/linux-2.6] / Documentation / pcmcia / driver.txt
2007-05-07 Bernhard Walleadd new_id to PCMCIA drivers