From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 26 Jun 2012 18:23:41 +0000 (-0700)
Subject: Merge branch 'upstream-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid
X-Git-Tag: v3.5-rc5~25
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=60d2c25251cac20d8c142a03e230237528b68430;p=linux-2.6-block.git

Merge branch 'upstream-fixes' of git://git./linux/kernel/git/jikos/hid

Pull HID fixes from Jiri Kosina:
 "The most important one is a purification of Kconfig for CONFIG_HID;
  the inclusion of HID groups and autoloading didn't leave the Kconfig
  in a really consistent state.  Henrik's patch fixes that.  In addition
  to that, there are two small fixes for logitech and magicmouse
  drivers."

* 'upstream-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid:
  HID: Fix the generic Kconfig options
  HID: magicmouse: Correct report range of major / minor axes
  HID: logitech: don't use stack based dj_report structures
---

60d2c25251cac20d8c142a03e230237528b68430