| commit | e25c173379d1053f0851fa924cd608fc0b16252f | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Tue Feb 07 14:06:11 2012 -0800 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Tue Feb 07 14:06:11 2012 -0800 |
| tree | 5819d87168530aacef34d3d2fadc45069de901fa | |
| parent | abaaf3e12c74ef39c8ba185c485f63274264cb0f [diff] | |
| parent | 217c8b2b1978aa4a02ce040a99c59ed3b6418fe5 [diff] |
Merge branch 'upstream-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid * 'upstream-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid: HID: wiimote: fix invalid power_supply_powers call HID: wacom: Fix invalid power_supply_powers calls HID: hyperv: Properly disconnect the input device HID: usbhid: fix dead lock between open and disconect