diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-12-02 08:25:46 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-12-02 08:25:46 -0800 |
commit | 7ed89aed2b897059c3d733cbd4994035b4ce1fba (patch) | |
tree | 2791d3ce5e40f2a3b5d7b937df259f9d59870a0b /fs | |
parent | Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux (diff) | |
parent | HID: Correct General touch PID (diff) | |
download | linux-dev-7ed89aed2b897059c3d733cbd4994035b4ce1fba.tar.xz linux-dev-7ed89aed2b897059c3d733cbd4994035b4ce1fba.zip |
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
Diffstat (limited to 'fs')
0 files changed, 0 insertions, 0 deletions