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
|
||
|---|---|---|
| .. | ||
| b43.h | ||
| debugfs.c | ||
| debugfs.h | ||
| dma.c | ||
| dma.h | ||
| Kconfig | ||
| leds.c | ||
| leds.h | ||
| lo.c | ||
| lo.h | ||
| main.c | ||
| main.h | ||
| Makefile | ||
| pcmcia.c | ||
| pcmcia.h | ||
| phy_a.c | ||
| phy_a.h | ||
| phy_common.c | ||
| phy_common.h | ||
| phy_g.c | ||
| phy_g.h | ||
| phy_lp.c | ||
| phy_lp.h | ||
| phy_n.c | ||
| phy_n.h | ||
| pio.c | ||
| pio.h | ||
| rfkill.c | ||
| rfkill.h | ||
| sdio.c | ||
| sdio.h | ||
| sysfs.c | ||
| sysfs.h | ||
| tables_lpphy.c | ||
| tables_lpphy.h | ||
| tables_nphy.c | ||
| tables_nphy.h | ||
| tables.c | ||
| tables.h | ||
| wa.c | ||
| wa.h | ||
| xmit.c | ||
| xmit.h | ||