summaryrefslogtreecommitdiffstats
path: root/drivers/pcmcia
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds...Paul Mundt2008-10-311-1/+2
|\
| * Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6Linus Torvalds2008-10-301-1/+2
| |\
| | * pcmcia: Whine harder about use of EXCLUSIVEAlan Cox2008-10-171-1/+2
* | | sh: Kill off long-dead HD64465 cchip support.Paul Mundt2008-10-283-944/+0
|/ /
* | Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-armLinus Torvalds2008-10-231-1/+1
|\ \
| * | [ARM] pxa: fix trizeps PCMCIA buildRussell King2008-10-171-1/+1
| |/
* | Merge branch 'genirq-v28-for-linus' of git://git.kernel.org/pub/scm/linux/ker...Linus Torvalds2008-10-203-5/+11
|\ \ | |/ |/|
| * generic: sparse irqs: use irq_desc() together with dyn_array, instead of irq_...Yinghai Lu2008-10-161-3/+9
| * drivers/pcmcia: use nr_irqsYinghai Lu2008-10-162-2/+2
* | [ARM] 5307/1: pxa: fix CM-X2XX PCMCIA build errorMike Rapoport2008-10-151-1/+2
|/
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6Linus Torvalds2008-10-1327-710/+943
|\
| * pcmcia: remove unused argument to pcmcia_parse_tuple()Dominik Brodowski2008-08-314-5/+7
| * pcmcia: card services header cleanupDominik Brodowski2008-08-313-4/+14
| * pcmcia: encapsulate ioaddr_tDominik Brodowski2008-08-292-2/+2
| * pcmcia: cleanup socket services header fileDominik Brodowski2008-08-261-0/+27
| * pcmcia: merge ds_internal.h into cs_internal.hDominik Brodowski2008-08-255-32/+40
| * pcmcia: cleanup cs_internal.hDominik Brodowski2008-08-251-64/+90
| * pcmcia: cs_internal.h is internalDominik Brodowski2008-08-255-5/+0
| * pcmcia: use dev_printk for cs_error()Dominik Brodowski2008-08-231-32/+18
| * pcmcia: deprecate CS_BAD_TUPLEDominik Brodowski2008-08-234-55/+98
| * pcmcia: deprecate CS_BAD_ARGSDominik Brodowski2008-08-233-9/+10
| * pcmcia: deprecate CS_BAD_BASE, CS_BAD_IRQ, CS_BAD_OFFSET and CS_BAD_SIZEDominik Brodowski2008-08-233-15/+18
| * pcmcia: deprecate CS_BAD_ATTRIBUTE, CS_BAD_TYPE and CS_BAD_PAGEDominik Brodowski2008-08-234-27/+34
| * pcmcia: deprecate CS_NO_MORE_ITEMSDominik Brodowski2008-08-234-8/+8
| * pcmcia: deprecate CS_IN_USEDominik Brodowski2008-08-232-17/+32
| * pcmcia: deprecate CS_CONFIGURATION_LOCKEDDominik Brodowski2008-08-232-7/+7
| * pcmcia: deprecate CS_BAD_HANDLEDominik Brodowski2008-08-233-11/+10
| * pcmcia: deprecate CS_GENERAL_FAILUREDominik Brodowski2008-08-232-3/+2
| * pcmcia: deprecate CS_NO_CARDDominik Brodowski2008-08-235-20/+20
| * pcmcia: deprecate CS_BAD_VCC and CS_BAD_VPPDominik Brodowski2008-08-232-11/+21
| * pcmcia: deprecate CS_UNSUPPORTED_*Dominik Brodowski2008-08-235-11/+12
| * pcmcia: deprecate CS_OUT_OF_RESOURCEDominik Brodowski2008-08-233-30/+47
| * pcmcia: deprecate unused CS_ error codesDominik Brodowski2008-08-231-10/+0
| * pcmcia: deprecate CS_SUCCESSDominik Brodowski2008-08-238-68/+77
| * pcmcia: move pccard_get_configuration_info to ioctlDominik Brodowski2008-08-233-80/+72
| *-. Merge branches 'pcmcia-config-loop' and 'pcmcia-printk' into pcmciaDominik Brodowski2008-08-2318-192/+304
| |\ \
| | | * pcmcia: don't add extra DEBUG cflagDominik Brodowski2008-08-2313-19/+15
| | | * pcmcia: remove unused cs_socket_name() definitionDominik Brodowski2008-08-231-2/+0
| | | * pcmcia: use dev_printk in module rsrc_nonstaticDominik Brodowski2008-08-231-15/+18
| | | * pcmcia: use dev_printk in module pcmciaDominik Brodowski2008-08-232-67/+81
| | | * pcmcia: use dev_printk in module pcmcia_coreDominik Brodowski2008-08-233-12/+17
| | | * pcmcia: use dev_printk and dev_dbg in yenta_socketDominik Brodowski2008-08-233-77/+97
| | * | pcmcia: pcmcia_config_loop() improvement by passing vccDominik Brodowski2008-08-231-1/+6
| | * | pcmcia: pcmcia_config_loop() default CIS entry handlingDominik Brodowski2008-08-231-1/+6
| | * | pcmcia: pcmcia_config_loop() ConfigIndex unificationDominik Brodowski2008-08-231-2/+6
| | * | pcmcia: add pcmcia_loop_config() helperDominik Brodowski2008-08-231-0/+62
| | |/
| * / pcmcia: only copy CIS override data onceDominik Brodowski2008-08-024-32/+13
| |/
* | Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-armLinus Torvalds2008-10-119-41/+825
|\ \
| * \ Merge branch 'for-rmk' of git://source.mvista.com/git/linux-davinci-2.6.gitRussell King2008-10-091-1/+5
| |\ \
| * | | [ARM] pxa: allow multi-machine PCMCIA buildsRussell King2008-10-071-9/+11
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-27 04:40:48 +0000