diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-06-18 03:10:40 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-06-18 03:10:40 +0200 |
| commit | 952f4a0a9b27e6dbd5d32e330b3f609ebfa0b061 (patch) | |
| tree | 5becdb0689960e2c8b9786a0a8d7c26ae5452957 /include | |
| parent | fuse: fix thinko in max I/O size calucation (diff) | |
| parent | Input: appletouch - implement reset-resume logic (diff) | |
| download | linux-952f4a0a9b27e6dbd5d32e330b3f609ebfa0b061.tar.xz linux-952f4a0a9b27e6dbd5d32e330b3f609ebfa0b061.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: appletouch - implement reset-resume logic
Input: i8042 - retry failed CTR writes when resuming
Input: i8042 - add Fujitsu-Siemens Amilo Pro V2030 to nomux table
Input: pcspkr - remove negative dependency on snd-pcsp
Manually fixed up trivial conflict in drivers/usb/core/quirks.c
Diffstat (limited to 'include')
0 files changed, 0 insertions, 0 deletions