diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-10 04:43:19 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-10 04:43:19 +0100 |
| commit | f6c4c8195b5e7878823caa1181be404d9e86d369 (patch) | |
| tree | 7fdc8b9c71cbf6793f699ddaa53e20a94647cd4a /drivers/spi/spi_stmp.c | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6 (diff) | |
| parent | Merge branches 'bkl-removal', 'upstream' and 'upstream-fixes' into for-linus (diff) | |
| download | linux-f6c4c8195b5e7878823caa1181be404d9e86d369.tar.xz linux-f6c4c8195b5e7878823caa1181be404d9e86d369.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid:
HID: add multi-input quirk for NextWindow Touchscreen.
HID: add support for Acan FG-8100 barcode reader
HID: make Media key on Logitech DiNovo Mini work
HID: support Logitech/3DConnexion SpaceTraveler and SpaceNavigator
HID: remove BKL from hiddev_ioctl_usage()
HID: fixup quirk for NCR devices
HID: pidff - fix unnecessary loop iterations on reset
HID: add NOGET quirk for another device from CH Products
HID: remove useless DRIVER_VERSION macro
HID: fix MODULE_AUTHOR usage in HID modules
HID: blacklist Acer Ferrari 4005 optical mouse
Diffstat (limited to 'drivers/spi/spi_stmp.c')
0 files changed, 0 insertions, 0 deletions