summaryrefslogtreecommitdiffstats
path: root/drivers
Commit message (Expand)AuthorAgeFilesLines
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6Linus Torvalds2008-10-1374-2869/+2576
|\
| * pcmcia: remove unused argument to pcmcia_parse_tuple()Dominik Brodowski2008-08-3114-24/+21
| * pcmcia: card services header cleanupDominik Brodowski2008-08-316-7/+17
| * pcmcia: encapsulate ioaddr_tDominik Brodowski2008-08-293-3/+4
| * 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-236-10/+10
| * 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-234-32/+49
| * pcmcia: deprecate unused CS_ error codesDominik Brodowski2008-08-231-10/+0
| * pcmcia: deprecate CS_SUCCESSDominik Brodowski2008-08-2335-212/+233
| * pcmcia: move pccard_get_configuration_info to ioctlDominik Brodowski2008-08-233-80/+72
| * pcmcia: remove remaining in-kernel pcmcia_get_configuration_info() usersDominik Brodowski2008-08-233-30/+10
| *-. Merge branches 'pcmcia-config-loop' and 'pcmcia-printk' into pcmciaDominik Brodowski2008-08-2348-2151/+1746
| |\ \
| | | * 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-2331-142/+92
| | * | pcmcia: pcmcia_config_loop() default CIS entry handlingDominik Brodowski2008-08-2331-165/+157
| | * | pcmcia: pcmcia_config_loop() ConfigIndex unificationDominik Brodowski2008-08-2329-46/+6
| | * | pcmcia: use pcmcia_loop_config in misc pcmcia driversDominik Brodowski2008-08-236-401/+299
| | * | pcmcia: use pcmcia_loop_config in net pcmcia driversDominik Brodowski2008-08-239-654/+596
| | * | pcmcia: use pcmcia_loop_config in ISDN pcmcia driversDominik Brodowski2008-08-235-319/+191
| | * | pcmcia: use pcmcia_loop_config in scsi pcmcia driversDominik Brodowski2008-08-235-198/+183
| | * | pcmcia: use pcmcia_loop_config in bluetooth driversDominik Brodowski2008-08-233-194/+108
| | * | pcmcia: use pcmcia_loop_config in pata and ide driversDominik Brodowski2008-08-232-172/+156
| | * | pcmcia: add pcmcia_loop_config() helperDominik Brodowski2008-08-231-0/+62
| | |/
| * | pcmcia: uniform device IDs of pata_pcmcia and ide-csDominik Brodowski2008-08-232-1/+4
| * | pcmcia: only copy CIS override data onceDominik Brodowski2008-08-024-32/+13
| |/
* | Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mch...Linus Torvalds2008-10-13350-6788/+29495
|\ \
| * | V4L/DVB (9186): Added support for Prof 7300 DVB-S/S2 cardsOleg Roitburd2008-10-133-18/+19
| * | V4L/DVB (9184): cx24116: Change the default SNR units back to percentage by d...Steven Toth2008-10-131-2/+2
| * | V4L/DVB (9183): S2API: Return error of the caller provides 0 commands.Steven Toth2008-10-131-2/+2
| * | V4L/DVB (9182): S2API: Added support for DTV_HIERARCHYSteven Toth2008-10-131-0/+16
OpenPOWER on IntegriCloud