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
|
||
|---|---|---|
| .. | ||
| hostap.h | ||
| hostap_80211.h | ||
| hostap_80211_rx.c | ||
| hostap_80211_tx.c | ||
| hostap_ap.c | ||
| hostap_ap.h | ||
| hostap_common.h | ||
| hostap_config.h | ||
| hostap_cs.c | ||
| hostap_download.c | ||
| hostap_hw.c | ||
| hostap_info.c | ||
| hostap_ioctl.c | ||
| hostap_main.c | ||
| hostap_pci.c | ||
| hostap_plx.c | ||
| hostap_proc.c | ||
| hostap_wlan.h | ||
| Kconfig | ||
| Makefile | ||