summaryrefslogtreecommitdiffstats
path: root/drivers/pcmcia
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6Linus Torvalds2010-08-122-5/+5
|\
| * of/device: Replace struct of_device with struct platform_deviceGrant Likely2010-08-062-5/+5
* | Merge branches 'master' and 'devel' into for-linusRussell King2010-08-103-1/+160
|\ \
| * \ Merge branch 'devel' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/...Russell King2010-08-063-1/+160
| |\ \ | | |/ | |/|
| | * [ARM] pxa/balloon3: PCMCIA SupportMarek Vasut2010-08-053-1/+160
* | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6Linus Torvalds2010-08-0627-1472/+320
|\ \ \ | |/ / |/| |
| * | pcmcia: avoid buffer overflow in pcmcia_setup_isa_irqDominik Brodowski2010-08-031-1/+4
| * | pcmcia: insert PCMCIA device resources into resource treeDominik Brodowski2010-08-036-34/+60
| * | pcmcia: export resource information to sysfsDominik Brodowski2010-08-031-0/+13
| * | pcmcia: use struct resource for PCMCIA devices, part 2Dominik Brodowski2010-08-033-32/+45
| * | pcmcia: remove memreq_tDominik Brodowski2010-08-031-6/+3
| * | pcmcia: move local definitions out of include/pcmcia/cs.hDominik Brodowski2010-08-032-0/+6
| * | pcmcia: do not use io_req_t when calling pcmcia_request_io()Dominik Brodowski2010-08-031-27/+10
| * | pcmcia: use struct resource for PCMCIA devicesDominik Brodowski2010-08-033-69/+93
| * | pcmcia: clean up cs.hDominik Brodowski2010-08-031-0/+3
| * | pcmcia: use pcmica_{read,write}_config_byteDominik Brodowski2010-08-033-33/+48
| * | pcmcia: remove cs_types.hDominik Brodowski2010-07-3024-25/+0
| * | pcmcia: remove unused flag, simplify headersDominik Brodowski2010-07-302-11/+7
| * | pcmcia: split up central event handlerDominik Brodowski2010-07-303-92/+54
| * | pcmcia: simplify event callbackDominik Brodowski2010-07-302-40/+10
| * | pcmcia: remove obsolete ioctlDominik Brodowski2010-07-307-1144/+6
* | | Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/upstream-linusLinus Torvalds2010-08-051-2/+2
|\ \ \
| * | | MIPS: Alchemy: remove SOC_AU1X00 in favor of MIPS_ALCHEMYManuel Lauss2010-08-051-2/+2
* | | | Merge branch 'master' into for-nextJiri Kosina2010-08-043-6/+6
|\ \ \ \ | |/ / /
| * | | Merge master.kernel.org:/home/rmk/linux-2.6-armLinus Torvalds2010-07-261-3/+2
| |\ \ \ | | |/ / | |/| |
| | * | [ARM] pxa: fix frequency scaling for pcmcia/pxa2xx_baseMarek Vasut2010-07-131-3/+2
| * | | pcmcia: fix 'driver ... did not release config properly' warningPatrick McHardy2010-07-211-1/+3
| |/ /
| * | pcmcia: do not initialize the present flag too late.Dominik Brodowski2010-07-051-2/+1
| |/
* | Merge branch 'master' into for-nextJiri Kosina2010-06-165-19/+36
|\ \ | |/
| * pcmcia: avoid validate_cis failure on CIS overrideDominik Brodowski2010-06-071-0/+1
| * pcmcia: yenta_socket.c Remove extra #ifdef CONFIG_YENTA_TIJustin P. Mattock2010-06-071-8/+6
| * pcmcia: only keep saved I365_CSCINT flag if there is no PCI irqDominik Brodowski2010-06-071-2/+3
| * of/pcmcia: m8xx_pcmcia.c: Fix build failuresAnatolij Gustschin2010-06-021-2/+2
| * Merge branch 'bkl/ioctl' of git://git.kernel.org/pub/scm/linux/kernel/git/fre...Linus Torvalds2010-05-241-3/+14
| |\
| | * drivers: Push down BKL into various driversArnd Bergmann2010-05-171-3/+14
| * | Merge remote branch 'origin' into secretlab/next-devicetreeGrant Likely2010-05-2218-864/+1192
| |\ \
| * | | of: Remove duplicate fields from of_platform_driverGrant Likely2010-05-222-4/+10
| * | | of: Always use 'struct device.of_node' to get device node pointer.Grant Likely2010-05-181-1/+1
* | | | fix typos concerning "initiali[zs]e"Uwe Kleine-König2010-06-161-1/+1
| |/ / |/| |
* | | sysfs: add struct file* to bin_attr callbacksChris Wright2010-05-211-2/+2
* | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6Linus Torvalds2010-05-2016-789/+893
|\ \ \
| * | | pcmcia: disable PCMCIA ioctl also for ARMDominik Brodowski2010-05-171-20/+0
| * | | pcmcia: remove suspend-related comment from yenta_socket.cDominik Brodowski2010-05-101-7/+0
| * | | pcmcia: call pcmcia_{read,write}_cis_mem with ops_mutex heldDominik Brodowski2010-05-103-19/+19
| * | | pcmcia: remove pcmcia_add_device_lockDominik Brodowski2010-05-101-16/+2
| * | | pcmcia: update gfp/slab.h includesTejun Heo2010-05-102-0/+2
| * | | pcmcia: do not autoadd root PCI bus resourcesDominik Brodowski2010-05-101-6/+29
| * | | pcmcia: clarify alloc_io_space, move it to resource handlersDominik Brodowski2010-05-105-99/+195
| * | | pcmcia: move all pcmcia_resource_ops providers into one moduleDominik Brodowski2010-05-106-117/+141
| * | | pcmcia: move high level CIS access code to separate fileDominik Brodowski2010-05-104-330/+356
OpenPOWER on IntegriCloud