| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge branch 'devel-stable' into devel | Russell King | 2011-01-06 | 6 | -20/+292 |
|\ |
|
| * | ARM: pxa: Update Balloon3 for new FPGA firmware | Marek Vasut | 2010-12-20 | 1 | -6/+5 |
| * | ARM: pxa: Colibri PXA320 PCMCIA driver | Marek Vasut | 2010-12-20 | 3 | -2/+19 |
| * | ARM: pxa: Toradex Colibri PXA270 CF support | Marek Vasut | 2010-12-20 | 3 | -1/+216 |
| * | ARM: pxa: Add pxa320 PCMCIA check | Marek Vasut | 2010-12-20 | 1 | -3/+18 |
| * | ARM: pxa: remove get_memclk_frequency_10khz() | Eric Miao | 2010-12-16 | 2 | -3/+17 |
| * | ARM: pxa: Access SMEMC via virtual addresses | Marek Vasut | 2010-12-16 | 1 | -8/+20 |
| | | |
| \ | |
| \ | |
| \ | |
*---. \ | Merge branches 'ftrace', 'gic', 'io', 'kexec', 'mod', 'sa11x0', 'sh' and 'ver... | Russell King | 2011-01-05 | 5 | -61/+293 |
|\ \ \ \
| |_|_|/
|/| | | |
|
| | | * | ARM: 6458/1: pcmcia: Adds nanoEngine PCMCIA support. | Marcelo Roberto Jimenez | 2010-12-21 | 4 | -1/+225 |
| | | * | ARM: 6457/1: pcmcia: Fix checkpatch.pl issues in drivers/pcmcia/soc_common.c. | Marcelo Roberto Jimenez | 2010-12-21 | 1 | -60/+68 |
| | |/ |
|
* | | | ARM: 6456/1: Fix for building DEBUG with sa11xx_base.c as a module. | Marcelo Roberto Jimenez | 2010-12-04 | 1 | -0/+1 |
|/ / |
|
* | | drivers/pcmcia/soc_common.c: Use printf extension %pV | Joe Perches | 2010-11-10 | 1 | -2/+7 |
* | | pcmcia/sa1100: don't put machine specific init functions in .init.text | Uwe Kleine-König | 2010-11-10 | 7 | -7/+7 |
* | | pd6729: Coding Style fixes | Komuro | 2010-11-10 | 2 | -5/+5 |
|/ |
|
* | Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jiko... | Linus Torvalds | 2010-10-24 | 1 | -1/+1 |
|\ |
|
| * | Update broken web addresses in the kernel. | Justin P. Mattock | 2010-10-18 | 1 | -1/+1 |
* | | pcmcia: IOCARD is also required for using IRQs | Dominik Brodowski | 2010-10-22 | 1 | -1/+3 |
* | | pcmcia: don't call flush_scheduled_work() spuriously | Tejun Heo | 2010-10-16 | 2 | -7/+0 |
* | | pcmcia/yenta: guide users in case of problems with O2-bridges | Wolfram Sang | 2010-10-15 | 1 | -2/+2 |
* | | pcmcia: fix unused function compile warning | Maciej Żenczykowski | 2010-10-14 | 1 | -1/+1 |
* | | pcmcia: vrc4173_cardu: Fix error path for pci_release_regions and pci_disable... | Rahul Ruikar | 2010-10-05 | 1 | -19/+39 |
* | | pcmcia: add a few debug statements | Dominik Brodowski | 2010-09-29 | 1 | -0/+10 |
* | | pcmcia: move driver name to struct pcmcia_driver | Dominik Brodowski | 2010-09-29 | 1 | -10/+11 |
* | | pcmcia: remove the "Finally, report what we've done" message | Dominik Brodowski | 2010-09-29 | 1 | -0/+7 |
* | | pcmcia: use autoconfiguration feature for ioports and iomem | Dominik Brodowski | 2010-09-29 | 1 | -11/+67 |
* | | pcmcia: introduce autoconfiguration feature | Dominik Brodowski | 2010-09-29 | 1 | -4/+32 |
* | | pcmcia: Documentation update | Dominik Brodowski | 2010-09-29 | 1 | -22/+89 |
* | | pcmcia: convert pcmcia_request_configuration to pcmcia_enable_device | Dominik Brodowski | 2010-09-29 | 23 | -44/+17 |
* | | pcmcia: move config_{base,index,regs} to struct pcmcia_device | Dominik Brodowski | 2010-09-29 | 4 | -27/+24 |
* | | pcmcia: simplify IntType | Dominik Brodowski | 2010-09-29 | 2 | -10/+1 |
* | | pcmcia: simplify Status, ExtStatus register access | Dominik Brodowski | 2010-09-29 | 2 | -10/+20 |
* | | pcmcia: remove Pin, Copy configuration register access | Dominik Brodowski | 2010-09-29 | 2 | -7/+9 |
* | | pcmcia: move Vpp setup to struct pcmcia_device | Dominik Brodowski | 2010-09-29 | 1 | -1/+2 |
* | | pcmcia: split up modify_configuration() into two fixup functions | Dominik Brodowski | 2010-09-29 | 1 | -65/+63 |
* | | pcmcia: do not use win_req_t when calling pcmcia_request_window() | Dominik Brodowski | 2010-09-29 | 1 | -27/+33 |
* | | pcmcia: pd6729: Fix error path | Rahul Ruikar | 2010-09-26 | 1 | -1/+1 |
* | | pcmcia: preserve configuration information if request_io fails partly | Dominik Brodowski | 2010-09-18 | 1 | -0/+6 |
* | | pcmcia: per-device, not per-socket debug messages | Dominik Brodowski | 2010-09-15 | 1 | -24/+27 |
* | | Merge branch 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6 | Linus Torvalds | 2010-08-12 | 2 | -5/+5 |
|\ \ |
|
| * | | of/device: Replace struct of_device with struct platform_device | Grant Likely | 2010-08-06 | 2 | -5/+5 |
* | | | Merge branches 'master' and 'devel' into for-linus | Russell King | 2010-08-10 | 3 | -1/+160 |
|\ \ \
| |_|/
|/| | |
|
| * | | Merge branch 'devel' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/... | Russell King | 2010-08-06 | 3 | -1/+160 |
| |\ \
| | |/
| |/| |
|
| | * | [ARM] pxa/balloon3: PCMCIA Support | Marek Vasut | 2010-08-05 | 3 | -1/+160 |
* | | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6 | Linus Torvalds | 2010-08-06 | 27 | -1472/+320 |
|\ \ \
| |/ /
|/| | |
|
| * | | pcmcia: avoid buffer overflow in pcmcia_setup_isa_irq | Dominik Brodowski | 2010-08-03 | 1 | -1/+4 |
| * | | pcmcia: insert PCMCIA device resources into resource tree | Dominik Brodowski | 2010-08-03 | 6 | -34/+60 |
| * | | pcmcia: export resource information to sysfs | Dominik Brodowski | 2010-08-03 | 1 | -0/+13 |
| * | | pcmcia: use struct resource for PCMCIA devices, part 2 | Dominik Brodowski | 2010-08-03 | 3 | -32/+45 |
| * | | pcmcia: remove memreq_t | Dominik Brodowski | 2010-08-03 | 1 | -6/+3 |
| * | | pcmcia: move local definitions out of include/pcmcia/cs.h | Dominik Brodowski | 2010-08-03 | 2 | -0/+6 |