diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-06-27 09:00:50 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-06-27 09:00:50 -0700 |
commit | 375ac3e09640fb16b6e6f1a1f1ee8aec30183fdf (patch) | |
tree | e6964eff8ecfc21ec1752f176c7d1a001074de4b /fs/xfs/xfs_iget.c | |
parent | edcda265225b90c8700b21758fffcba61d19e046 (diff) | |
parent | c3ead6de4f6bd1c08a81f84e629e3dbf4a9078f0 (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: hid-multitouch: add support for a new Lumio dual-touch panel
HID: hid-multitouch: correct VID for Stantum panels
HID: hid-multitouch: ensure slots are initialized
Diffstat (limited to 'fs/xfs/xfs_iget.c')
0 files changed, 0 insertions, 0 deletions