diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-08-24 06:45:54 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-08-24 06:45:54 +0200 |
| commit | d37e44969e60dc652fdbaf4397d5436e07c967af (patch) | |
| tree | 8a130821c1b4aaa7fae9df7d474af576fce7359b /kernel/time/timekeeping.c | |
| parent | Linux 3.6-rc3 (diff) | |
| parent | HID: Remove QUANTA from special drivers list (diff) | |
| download | linux-d37e44969e60dc652fdbaf4397d5436e07c967af.tar.xz linux-d37e44969e60dc652fdbaf4397d5436e07c967af.zip | |
Merge branch 'upstream-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid
Pull HID fix from Jiri Kosina:
"Fix for one particular device not being properly claimed by
hid-multitouch driver"
* 'upstream-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid:
HID: Remove QUANTA from special drivers list
Diffstat (limited to 'kernel/time/timekeeping.c')
0 files changed, 0 insertions, 0 deletions