| commit | 7ed89aed2b897059c3d733cbd4994035b4ce1fba | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Fri Dec 02 08:25:46 2011 -0800 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Fri Dec 02 08:25:46 2011 -0800 |
| tree | 2791d3ce5e40f2a3b5d7b937df259f9d59870a0b | |
| parent | c2b5adb4868c190dd9d6dc624567fa38f1ba79af [diff] | |
| parent | b1807719f6acdf18cc4bde3b5400d05d77801494 [diff] |
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: Correct General touch PID