diff options
author | Linus Torvalds <torvalds@woody.osdl.org> | 2007-01-11 18:26:28 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.osdl.org> | 2007-01-11 18:26:28 -0800 |
commit | d39c9400ae0d60aaaf534b1ad860a9bc1413d8af (patch) | |
tree | f4d0c6aa0f7b556be324b5b1657467980225b769 /arch/mips/kernel/r4k_switch.S | |
parent | e947382ed38563544d2b5b79f6ea90bdde350e5e (diff) | |
parent | 531498013163c72cee8540e98e12c0c430c7fe87 (diff) |
Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jikos/hid
* 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jikos/hid:
HID: Fix DRIVER_DESC macro
HID: mousepoll parameter makes no sense for generic HID
HID: tiny patch to remove a kmalloc cast
HID: fix mappings for DiNovo Edge Keyboard - Logitech USB BT receiver
Diffstat (limited to 'arch/mips/kernel/r4k_switch.S')
0 files changed, 0 insertions, 0 deletions