summaryrefslogtreecommitdiffstats
path: root/drivers/hid/hid-magicmouse.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-12-02 17:40:04 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2010-12-02 17:40:04 -0800
commit59e57c622c3502346e8f930421ebc482d639520c (patch)
treeb3e8e450fdcc07dd1ed92fac9cc712870f2ca2dc /drivers/hid/hid-magicmouse.c
parent33dd94ae1ccbfb7bf0fb6c692bc3d1c4269e6177 (diff)
parent83ed79c561da20019cb24944f535530d73b2d615 (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)
Diffstat (limited to 'drivers/hid/hid-magicmouse.c')
0 files changed, 0 insertions, 0 deletions