From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 1 Dec 2008 16:33:59 +0000 (-0800)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid
X-Git-Tag: v2.6.28-rc7~29
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=c07f62e5f18123103459ff74e86af1518a5b8af5;p=linux-2.6-omap-h63xx.git

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: Apple ALU wireless keyboards are bluetooth devices
  HID: remove setup mutex, fix possible deadlock
  HID: add USB ID for another dual gameron adapter
  HID: unignore mouse on unibody macbooks
  HID: fix blacklist entries for greenasia/pantherlord
---

c07f62e5f18123103459ff74e86af1518a5b8af5