2be4ff2f08
* 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 |
||
|---|---|---|
| .. | ||
| Kconfig | ||
| Makefile | ||
| alchemy-flash.c | ||
| amd76xrom.c | ||
| autcpu12-nvram.c | ||
| bfin-async-flash.c | ||
| cdb89712.c | ||
| ceiva.c | ||
| cfi_flagadm.c | ||
| ck804xrom.c | ||
| dbox2-flash.c | ||
| dc21285.c | ||
| dilnetpc.c | ||
| dmv182.c | ||
| ebony.c | ||
| edb7312.c | ||
| esb2rom.c | ||
| fortunet.c | ||
| h720x-flash.c | ||
| ichxrom.c | ||
| impa7.c | ||
| integrator-flash.c | ||
| intel_vr_nor.c | ||
| ipaq-flash.c | ||
| ixp4xx.c | ||
| ixp2000.c | ||
| l440gx.c | ||
| map_funcs.c | ||
| mbx860.c | ||
| netsc520.c | ||
| nettel.c | ||
| ocotea.c | ||
| octagon-5066.c | ||
| omap-toto-flash.c | ||
| omap_nor.c | ||
| pci.c | ||
| pcmciamtd.c | ||
| physmap.c | ||
| physmap_of.c | ||
| plat-ram.c | ||
| pmcmsp-flash.c | ||
| pmcmsp-ramroot.c | ||
| pxa2xx-flash.c | ||
| redwood.c | ||
| rpxlite.c | ||
| sa1100-flash.c | ||
| sbc8240.c | ||
| sbc_gxx.c | ||
| sc520cdp.c | ||
| scb2_flash.c | ||
| scx200_docflash.c | ||
| sharpsl-flash.c | ||
| solutionengine.c | ||
| sun_uflash.c | ||
| tqm8xxl.c | ||
| ts5500_flash.c | ||
| tsunami_flash.c | ||
| uclinux.c | ||
| vmax301.c | ||
| walnut.c | ||
| wr_sbc82xx_flash.c | ||