1685e633b3
* git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6:
pcmcia: avoid buffer overflow in pcmcia_setup_isa_irq
pcmcia: do not request windows if you don't need to
pcmcia: insert PCMCIA device resources into resource tree
pcmcia: export resource information to sysfs
pcmcia: use struct resource for PCMCIA devices, part 2
pcmcia: remove memreq_t
pcmcia: move local definitions out of include/pcmcia/cs.h
pcmcia: do not use io_req_t when calling pcmcia_request_io()
pcmcia: do not use io_req_t after call to pcmcia_request_io()
pcmcia: use struct resource for PCMCIA devices
pcmcia: clean up cs.h
pcmcia: use pcmica_{read,write}_config_byte
pcmcia: remove cs_types.h
pcmcia: remove unused flag, simplify headers
pcmcia: remove obsolete CS_EVENT_ definitions
pcmcia: split up central event handler
pcmcia: simplify event callback
pcmcia: remove obsolete ioctl
Conflicts in:
- drivers/staging/comedi/drivers/*
- drivers/staging/wlags49_h2/wl_cs.c
due to dev_info_t and whitespace changes
|
||
|---|---|---|
| .. | ||
| amd7930_fn.c | ||
| amd7930_fn.h | ||
| arcofi.c | ||
| arcofi.h | ||
| asuscom.c | ||
| avm_a1.c | ||
| avm_a1p.c | ||
| avm_pci.c | ||
| avma1_cs.c | ||
| bkm_a4t.c | ||
| bkm_a8.c | ||
| bkm_ax.h | ||
| callc.c | ||
| config.c | ||
| diva.c | ||
| elsa_cs.c | ||
| elsa_ser.c | ||
| elsa.c | ||
| enternow_pci.c | ||
| fsm.c | ||
| fsm.h | ||
| gazel.c | ||
| hfc4s8s_l1.c | ||
| hfc4s8s_l1.h | ||
| hfc_2bds0.c | ||
| hfc_2bds0.h | ||
| hfc_2bs0.c | ||
| hfc_2bs0.h | ||
| hfc_pci.c | ||
| hfc_pci.h | ||
| hfc_sx.c | ||
| hfc_sx.h | ||
| hfc_usb.c | ||
| hfc_usb.h | ||
| hfcscard.c | ||
| hisax_cfg.h | ||
| hisax_debug.h | ||
| hisax_fcpcipnp.c | ||
| hisax_fcpcipnp.h | ||
| hisax_if.h | ||
| hisax_isac.c | ||
| hisax_isac.h | ||
| hisax.h | ||
| hscx_irq.c | ||
| hscx.c | ||
| hscx.h | ||
| icc.c | ||
| icc.h | ||
| ipac.h | ||
| ipacx.c | ||
| ipacx.h | ||
| isac.c | ||
| isac.h | ||
| isar.c | ||
| isar.h | ||
| isdnl1.c | ||
| isdnl1.h | ||
| isdnl2.c | ||
| isdnl2.h | ||
| isdnl3.c | ||
| isdnl3.h | ||
| isurf.c | ||
| ix1_micro.c | ||
| jade_irq.c | ||
| jade.c | ||
| jade.h | ||
| Kconfig | ||
| l3_1tr6.c | ||
| l3_1tr6.h | ||
| l3dss1.c | ||
| l3dss1.h | ||
| l3ni1.c | ||
| l3ni1.h | ||
| lmgr.c | ||
| Makefile | ||
| mic.c | ||
| netjet.c | ||
| netjet.h | ||
| niccy.c | ||
| nj_s.c | ||
| nj_u.c | ||
| q931.c | ||
| s0box.c | ||
| saphir.c | ||
| sedlbauer_cs.c | ||
| sedlbauer.c | ||
| sportster.c | ||
| st5481_b.c | ||
| st5481_d.c | ||
| st5481_init.c | ||
| st5481_usb.c | ||
| st5481.h | ||
| tei.c | ||
| teleint.c | ||
| teles0.c | ||
| teles3.c | ||
| teles_cs.c | ||
| telespci.c | ||
| w6692.c | ||
| w6692.h | ||