diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-24 00:39:36 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-24 00:39:36 +0200 |
| commit | 0dd52d0df02733dfc2d5f3824e41b96492305384 (patch) | |
| tree | 4cfd84b7a66d71d83c624275d889136fb23a33c9 /drivers/acpi/osl.c | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-next (diff) | |
| parent | Input: add driver for Atmel AT42QT2160 Sensor Chip (diff) | |
| download | linux-0dd52d0df02733dfc2d5f3824e41b96492305384.tar.xz linux-0dd52d0df02733dfc2d5f3824e41b96492305384.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
Input: add driver for Atmel AT42QT2160 Sensor Chip
Input: max7359 - use threaded IRQs
Input: add driver for Maxim MAX7359 key switch controller
Input: add driver for ADP5588 QWERTY I2C Keypad
Input: add touchscreen driver for MELFAS MCS-5000 controller
Input: add driver for OpenCores Keyboard Controller
Input: dm355evm_keys - remove dm355evm_keys_hardirq
Input: synaptics_i2c - switch to using __cancel_delayed_work()
Input: ad7879 - add support for AD7889
Input: atkbd - rely on input core to restore state on resume
Input: add generic suspend and resume for input devices
Input: libps2 - additional locking for i8042 ports
Diffstat (limited to 'drivers/acpi/osl.c')
0 files changed, 0 insertions, 0 deletions