tree 8cfd656a6c86a3fefde957962c419923e9a1640d
parent aace99e57c90353a51952e9dd1f6f110eec30d15
parent 1f41a6a9947615dca37d80b044ab81616e956a67
author Linus Torvalds <torvalds@linux-foundation.org> 1340735021 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1340735021 -0700

Merge branch 'upstream-fixes' of git://git.kernel.org/pub/scm/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