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_pci_bridge.c
driver_chipcommon.c	ssb: Turn suspend/resume upside down	2008-04-08 15:05:57 -04:00
driver_extif.c
driver_gige.c
driver_mipscore.c	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2008-04-14 02:30:23 -07:00
driver_pcicore.c	ssb-pcicore: Fix IRQ-vector init on embedded devices	2008-07-07 15:31:40 -04:00
embedded.c
Kconfig	ssb, b43, b43legacy, b44: Rewrite SSB DMA API	2008-06-27 09:09:15 -04:00
main.c	[SSB] Initialise dma_mask for SSB_BUSTYPE_SSB devices	2008-09-27 15:45:37 +01:00
Makefile
pci.c	ssb: Clean up extraction of MAC addresses from SPROM	2008-08-29 16:24:07 -04:00
pcihost_wrapper.c	ssb: Turn suspend/resume upside down	2008-04-08 15:05:57 -04:00
pcmcia.c	pcmcia: deprecate CS_NO_MORE_ITEMS	2008-08-23 02:29:54 +02:00
scan.c
sprom.c
ssb_private.h	ssb: Turn suspend/resume upside down	2008-04-08 15:05:57 -04:00