diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-04-02 08:18:02 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-04-02 08:18:02 -0700 |
commit | 483f64c430ad981188d865ee635f3f7a469f0b12 (patch) | |
tree | 49fcb77999fa29dc111c1255133224e69974383e /fs/nls/nls_cp857.c | |
parent | bc53ba2918bef821dec3528397bc49cd55291e56 (diff) | |
parent | c565c54d9bf336ec9cd22288d3aa4fb6e372e727 (diff) |
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 NOGET quirk for Quanta Pixart touchscreen
HID: fix oops in gyration_event()
Diffstat (limited to 'fs/nls/nls_cp857.c')
0 files changed, 0 insertions, 0 deletions