forked from Minki/linux
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
|
||
|---|---|---|
| .. | ||
| adis16255 | ||
| asus_oled | ||
| batman-adv | ||
| comedi | ||
| crystalhd | ||
| cx25821 | ||
| cxt1e1 | ||
| dream | ||
| dt3155v4l | ||
| easycap | ||
| echo | ||
| et131x | ||
| frontier | ||
| go7007 | ||
| hv | ||
| iio | ||
| line6 | ||
| lirc | ||
| memrar | ||
| mrst-touchscreen | ||
| msm | ||
| octeon | ||
| otus | ||
| panel | ||
| phison | ||
| pohmelfs | ||
| quatech_usb2 | ||
| quickstart | ||
| rt2860 | ||
| rt2870 | ||
| rtl8187se | ||
| rtl8192e | ||
| rtl8192su | ||
| rtl8192u | ||
| samsung-laptop | ||
| sep | ||
| serqt_usb2 | ||
| slicoss | ||
| sm7xx | ||
| solo6x10 | ||
| spectra | ||
| ti-st | ||
| tidspbridge | ||
| tm6000 | ||
| udlfb | ||
| usbip | ||
| vme | ||
| vt6655 | ||
| vt6656 | ||
| winbond | ||
| wlags49_h2 | ||
| wlags49_h25 | ||
| wlan-ng | ||
| xgifb | ||
| zram | ||
| Kconfig | ||
| Makefile | ||
| staging.c | ||