aboutsummaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-12-02 08:25:46 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2011-12-02 08:25:46 -0800
commit7ed89aed2b897059c3d733cbd4994035b4ce1fba (patch)
tree2791d3ce5e40f2a3b5d7b937df259f9d59870a0b /fs
parentMerge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux (diff)
parentHID: Correct General touch PID (diff)
downloadlinux-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