| author | Linus Torvalds <torvalds@linux-foundation.org> | |
| Fri, 3 Dec 2010 01:40:04 +0000 (17:40 -0800) | ||
| committer | Linus Torvalds <torvalds@linux-foundation.org> | |
| Fri, 3 Dec 2010 01:40:04 +0000 (17:40 -0800) | ||
| commit | 59e57c622c3502346e8f930421ebc482d639520c | |
| tree | b3e8e450fdcc07dd1ed92fac9cc712870f2ca2dc | tree | snapshot (tar.xz tar.gz zip) |
| parent | 33dd94ae1ccbfb7bf0fb6c692bc3d1c4269e6177 | commit | diff |
| parent | 83ed79c561da20019cb24944f535530d73b2d615 | commit | 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: length resolution should be reported units/mm
HID: add support for F430 Force Feedback Wheel
HID: egalax: Use kzalloc
HID: Remove KERN_DEBUG from dbg_hid use
Manually fixed trivial conflict in drivers/hid/hid-input.c (due to
removal of KERN_DEBUG from dbg_hid use clashing with new keycode
interface switch)
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid:
HID: length resolution should be reported units/mm
HID: add support for F430 Force Feedback Wheel
HID: egalax: Use kzalloc
HID: Remove KERN_DEBUG from dbg_hid use
Manually fixed trivial conflict in drivers/hid/hid-input.c (due to
removal of KERN_DEBUG from dbg_hid use clashing with new keycode
interface switch)
| drivers/hid/hid-core.c | diff1 | | diff2 | | blob | history |
| drivers/hid/hid-input.c | diff1 | | diff2 | | blob | history |