From: Linus Torvalds Date: Fri, 12 Jan 2007 02:26:28 +0000 (-0800) Subject: Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jikos/hid X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=d39c9400ae0d60aaaf534b1ad860a9bc1413d8af;p=linux-beck.git 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 --- d39c9400ae0d60aaaf534b1ad860a9bc1413d8af