From: Linus Torvalds Date: Fri, 15 Feb 2008 05:30:22 +0000 (-0800) Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid X-Git-Tag: v2.6.25-rc2~3 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=4ee29f6a52158cea526b16a44ae38643946103ec;p=platform%2Fkernel%2Flinux-stable.git Merge branch 'for-linus' of git://git./linux/kernel/git/jikos/hid * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid: HID: add USB IDs for MacBook 3rd generation HID: add LCSPEC from VERNIER to quirk list HID: fix processing of event quirks HID: Blacklist new GTCO CalComp USB device PIDs --- 4ee29f6a52158cea526b16a44ae38643946103ec