| Commit message (Expand) | Author | Age | Files | Lines |
* | 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-11 | 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 |
| * | | pcmcia: do not use io_req_t when calling pcmcia_request_io() | Dominik Brodowski | 2010-08-03 | 1 | -27/+10 |
| * | | pcmcia: use struct resource for PCMCIA devices | Dominik Brodowski | 2010-08-03 | 3 | -69/+93 |
| * | | pcmcia: clean up cs.h | Dominik Brodowski | 2010-08-03 | 1 | -0/+3 |
| * | | pcmcia: use pcmica_{read,write}_config_byte | Dominik Brodowski | 2010-08-03 | 3 | -33/+48 |
| * | | pcmcia: remove cs_types.h | Dominik Brodowski | 2010-07-30 | 24 | -25/+0 |
| * | | pcmcia: remove unused flag, simplify headers | Dominik Brodowski | 2010-07-30 | 2 | -11/+7 |
| * | | pcmcia: split up central event handler | Dominik Brodowski | 2010-07-30 | 3 | -92/+54 |
| * | | pcmcia: simplify event callback | Dominik Brodowski | 2010-07-30 | 2 | -40/+10 |
| * | | pcmcia: remove obsolete ioctl | Dominik Brodowski | 2010-07-30 | 7 | -1144/+6 |
* | | | Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/upstream-linus | Linus Torvalds | 2010-08-05 | 1 | -2/+2 |
|\ \ \ |
|
| * | | | MIPS: Alchemy: remove SOC_AU1X00 in favor of MIPS_ALCHEMY | Manuel Lauss | 2010-08-05 | 1 | -2/+2 |
* | | | | Merge branch 'master' into for-next | Jiri Kosina | 2010-08-04 | 3 | -6/+6 |
|\| | | |
|
| * | | | Merge master.kernel.org:/home/rmk/linux-2.6-arm | Linus Torvalds | 2010-07-26 | 1 | -3/+2 |
| |\ \ \
| | |/ /
| |/| | |
|
| | * | | [ARM] pxa: fix frequency scaling for pcmcia/pxa2xx_base | Marek Vasut | 2010-07-13 | 1 | -3/+2 |
| * | | | pcmcia: fix 'driver ... did not release config properly' warning | Patrick McHardy | 2010-07-21 | 1 | -1/+3 |
| |/ / |
|
| * / | pcmcia: do not initialize the present flag too late. | Dominik Brodowski | 2010-07-05 | 1 | -2/+1 |
| |/ |
|
* | | Merge branch 'master' into for-next | Jiri Kosina | 2010-06-16 | 5 | -19/+36 |
|\| |
|
| * | pcmcia: avoid validate_cis failure on CIS override | Dominik Brodowski | 2010-06-07 | 1 | -0/+1 |
| * | pcmcia: yenta_socket.c Remove extra #ifdef CONFIG_YENTA_TI | Justin P. Mattock | 2010-06-07 | 1 | -8/+6 |
| * | pcmcia: only keep saved I365_CSCINT flag if there is no PCI irq | Dominik Brodowski | 2010-06-07 | 1 | -2/+3 |
| * | of/pcmcia: m8xx_pcmcia.c: Fix build failures | Anatolij Gustschin | 2010-06-03 | 1 | -2/+2 |
| * | Merge branch 'bkl/ioctl' of git://git.kernel.org/pub/scm/linux/kernel/git/fre... | Linus Torvalds | 2010-05-24 | 1 | -3/+14 |
| |\ |
|
| | * | drivers: Push down BKL into various drivers | Arnd Bergmann | 2010-05-17 | 1 | -3/+14 |
| * | | Merge remote branch 'origin' into secretlab/next-devicetree | Grant Likely | 2010-05-22 | 18 | -864/+1192 |
| |\ \ |
|
| * | | | of: Remove duplicate fields from of_platform_driver | Grant Likely | 2010-05-22 | 2 | -4/+10 |
| * | | | of: Always use 'struct device.of_node' to get device node pointer. | Grant Likely | 2010-05-19 | 1 | -1/+1 |
* | | | | fix typos concerning "initiali[zs]e" | Uwe Kleine-König | 2010-06-16 | 1 | -1/+1 |
| |/ /
|/| | |
|
* | | | sysfs: add struct file* to bin_attr callbacks | Chris Wright | 2010-05-21 | 1 | -2/+2 |
* | | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6 | Linus Torvalds | 2010-05-20 | 16 | -789/+893 |
|\ \ \ |
|
| * | | | pcmcia: disable PCMCIA ioctl also for ARM | Dominik Brodowski | 2010-05-17 | 1 | -20/+0 |
| * | | | pcmcia: remove suspend-related comment from yenta_socket.c | Dominik Brodowski | 2010-05-10 | 1 | -7/+0 |
| * | | | pcmcia: call pcmcia_{read,write}_cis_mem with ops_mutex held | Dominik Brodowski | 2010-05-10 | 3 | -19/+19 |
| * | | | pcmcia: remove pcmcia_add_device_lock | Dominik Brodowski | 2010-05-10 | 1 | -16/+2 |
| * | | | pcmcia: update gfp/slab.h includes | Tejun Heo | 2010-05-10 | 2 | -0/+2 |
| * | | | pcmcia: do not autoadd root PCI bus resources | Dominik Brodowski | 2010-05-10 | 1 | -6/+29 |
| * | | | pcmcia: clarify alloc_io_space, move it to resource handlers | Dominik Brodowski | 2010-05-10 | 5 | -99/+195 |
| * | | | pcmcia: move all pcmcia_resource_ops providers into one module | Dominik Brodowski | 2010-05-10 | 6 | -117/+141 |
| * | | | pcmcia: move high level CIS access code to separate file | Dominik Brodowski | 2010-05-10 | 4 | -330/+356 |