Linus Torvalds 1685e633b3 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: 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		2010-08-06 12:25:06 -07:00
..
b43.h	drivers/net: use __packed annotation	2010-06-03 03:18:23 -07:00
debugfs.c
debugfs.h
dma.c	b43: replace the ssb_dma API with the generic DMA API	2010-06-04 16:00:42 -04:00
dma.h	drivers/net: use __packed annotation	2010-06-03 03:18:23 -07:00
Kconfig
leds.c
leds.h
lo.c
lo.h
main.c	b43: silence most sparse warnings	2010-07-21 14:37:38 -04:00
main.h
Makefile
pcmcia.c	pcmcia: use struct resource for PCMCIA devices, part 2	2010-08-03 09:04:16 +02:00
pcmcia.h
phy_a.c
phy_a.h
phy_common.c
phy_common.h
phy_g.c	b43: silence most sparse warnings	2010-07-21 14:37:38 -04:00
phy_g.h
phy_lp.c	b43: silence most sparse warnings	2010-07-21 14:37:38 -04:00
phy_lp.h
phy_n.c	b43: silence phy_n sparse warnings	2010-07-21 14:49:46 -04:00
phy_n.h
pio.c
pio.h
rfkill.c
rfkill.h
sdio.c	b43: Add SDIO_DEVICE() for EW-CG1102GC	2010-06-28 15:16:19 -04:00
sdio.h
sysfs.c
sysfs.h
tables_lpphy.c
tables_lpphy.h
tables_nphy.c
tables_nphy.h
tables.c
tables.h
wa.c	b43: silence most sparse warnings	2010-07-21 14:37:38 -04:00
wa.h
xmit.c
xmit.h	drivers/net: use __packed annotation	2010-06-03 03:18:23 -07:00