path: root/block
diff options
authorLinus Torvalds <torvalds@g5.osdl.org>2006-06-30 15:36:52 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2006-06-30 15:36:52 -0700
commit39302175c26d74be35715c05a0f342c9e64c21bf (patch)
treedcb582a16276592f09a1def1e9c296c2c6a437a9 /block
parent1cfef5ed631dedc55ca3c57a5fcfd01c77db3b59 (diff)
parent4b7a89a3c1cf545b03470416aa821fc2ff826b91 (diff)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6/
* git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6/: [PATCH] pcmcia: fix deadlock in pcmcia_parse_events [PATCH] com20020_cs: more device support [PATCH] au1xxx: pcmcia: fix __init called from non-init [PATCH] kill open-coded offsetof in cm4000_cs.c ZERO_DEV() [PATCH] pcmcia: convert pcmcia_cs to kthread [PATCH] pcmcia: fix kernel-doc function name [PATCH] pcmcia: hostap_cs.c - 0xc00f,0x0000 conflicts with pcnet_cs [PATCH] pcmcia: at91_cf suspend/resume/wakeup [PATCH] pcmcia: Make ide_cs work with the memory space of CF-Cards if IO space is not available [PATCH] pcmcia: TI PCIxx12 CardBus controller support [PATCH] pcmcia: warn if driver requests exclusive, but gets a shared IRQ [PATCH] pcmcia: expose tool in pcmcia/Documentation/pcmcia/ [PATCH] pcmcia: another ID for serial_cs.c [PATCH] yenta: fix hidden PCI bus numbers [PATCH] yenta: do power-up only after socket is configured
Diffstat (limited to 'block')
0 files changed, 0 insertions, 0 deletions