From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Wed, 7 Mar 2007 01:34:28 +0000 (-0800)
Subject: Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jikos/hid
X-Git-Tag: v2.6.21-rc3~19
X-Git-Url: http://git.samba.org/samba.git/?p=sfrench%2Fcifs-2.6.git;a=commitdiff_plain;h=7c368bb1049bde17fc4f8655492478d7f2918da9

Merge branch 'for-linus' of /linux/kernel/git/jikos/hid

* 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jikos/hid:
  HID blacklisting of all Code Mercenaries IOWarrior devices
---

7c368bb1049bde17fc4f8655492478d7f2918da9