Linus Torvalds 2be4ff2f08 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: (49 commits) pcmcia: ioctl-internal definitions pcmcia: cistpl header cleanup pcmcia: remove unused argument to pcmcia_parse_tuple() pcmcia: card services header cleanup pcmcia: device_id header cleanup pcmcia: encapsulate ioaddr_t pcmcia: cleanup device driver header file pcmcia: cleanup socket services header file pcmcia: merge ds_internal.h into cs_internal.h pcmcia: cleanup cs_internal.h pcmcia: cs_internal.h is internal pcmcia: use dev_printk for cs_error() pcmcia: remove CS_ error codes alltogether pcmcia: deprecate CS_BAD_TUPLE pcmcia: deprecate CS_BAD_ARGS pcmcia: deprecate CS_BAD_BASE, CS_BAD_IRQ, CS_BAD_OFFSET and CS_BAD_SIZE pcmcia: deprecate CS_BAD_ATTRIBUTE, CS_BAD_TYPE and CS_BAD_PAGE pcmcia: deprecate CS_NO_MORE_ITEMS pcmcia: deprecate CS_IN_USE pcmcia: deprecate CS_CONFIGURATION_LOCKED ... Fix trivial conflict in drivers/pcmcia/ds.c manually		2008-10-13 14:12:40 -07:00
..
b43.h	b43: fix QoS parameters initialization	2008-09-15 16:48:25 -04:00
debugfs.c
debugfs.h
dma.c
dma.h
Kconfig	b43: Add LP-PHY template	2008-09-05 16:17:43 -04:00
leds.c
leds.h
lo.c
lo.h
main.c	mac80211: add multi-rate retry support	2008-10-06 18:14:57 -04:00
main.h
Makefile	b43: Add LP-PHY template	2008-09-05 16:17:43 -04:00
pcmcia.c
pcmcia.h
phy_a.c	b43: Move Analog switching into phy code	2008-09-08 14:00:16 -04:00
phy_a.h	b43: Split PHY alloc and init	2008-09-05 16:17:49 -04:00
phy_common.c	mac80211: use nl80211 interface types	2008-09-15 16:48:23 -04:00
phy_common.h	b43: Move Analog switching into phy code	2008-09-08 14:00:16 -04:00
phy_g.c	b43 G-PHY: Remove mmiowb()	2008-09-11 15:53:32 -04:00
phy_g.h	b43: Split PHY alloc and init	2008-09-05 16:17:49 -04:00
phy_lp.c	b43: Move Analog switching into phy code	2008-09-08 14:00:16 -04:00
phy_lp.h	b43: Split PHY alloc and init	2008-09-05 16:17:49 -04:00
phy_n.c	b43: Move Analog switching into phy code	2008-09-08 14:00:16 -04:00
phy_n.h	b43: Split PHY alloc and init	2008-09-05 16:17:49 -04:00
pio.c
pio.h
rfkill.c	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2008-10-01 06:12:56 -07:00
rfkill.h
sysfs.c
sysfs.h
tables_nphy.c	b43: Move code from nphy.* to phy_n.*	2008-09-05 16:17:43 -04:00
tables_nphy.h
tables.c
tables.h
wa.c
wa.h
xmit.c	mac80211: add multi-rate retry support	2008-10-06 18:14:57 -04:00
xmit.h