diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-06-26 18:23:41 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-06-26 18:23:41 (GMT) |
| commit | 60d2c25251cac20d8c142a03e230237528b68430 (patch) | |
| tree | 8cfd656a6c86a3fefde957962c419923e9a1640d /lib/pci_iomap.c | |
| parent | aace99e57c90353a51952e9dd1f6f110eec30d15 (diff) | |
| parent | 1f41a6a9947615dca37d80b044ab81616e956a67 (diff) | |
| download | linux-fsl-qoriq-60d2c25251cac20d8c142a03e230237528b68430.tar.xz | |
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
Diffstat (limited to 'lib/pci_iomap.c')
0 files changed, 0 insertions, 0 deletions