diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-24 05:19:31 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-24 05:19:31 +0100 |
| commit | 9b82e65d65c90faecc408bcdc14a0229736ed193 (patch) | |
| tree | 2cf5fd4f4df01c6488afd0046325405381a73e36 /drivers/input/mouse/elantech.c | |
| parent | Merge branch 'upstream-linus' of git://github.com/jgarzik/libata-dev (diff) | |
| parent | virtio-pci: make reset operation safer (diff) | |
| download | linux-9b82e65d65c90faecc408bcdc14a0229736ed193.tar.xz linux-9b82e65d65c90faecc408bcdc14a0229736ed193.zip | |
Merge git://github.com/rustyrussell/linux
* git://github.com/rustyrussell/linux:
virtio-pci: make reset operation safer
virtio-mmio: Correct the name of the guest features selector
virtio: add HAS_IOMEM dependency to MMIO platform bus driver
Diffstat (limited to 'drivers/input/mouse/elantech.c')
0 files changed, 0 insertions, 0 deletions