diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-12-12 13:13:47 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-12-12 13:13:47 -0800 |
| commit | ea4ebd1cb093c8ec5d7f4bf9070dc444184c3971 (patch) | |
| tree | b1a3fd2e9dd3846d5d30c5e75c79db1ad31c0d80 /include | |
| parent | 846f29a6afb5f272ee1c8b2a57c5730ab31eabaa (diff) | |
| parent | 241ecf1ce528804d5ffc8fb386ff2a01b1f937c4 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
Pull input fixes from Dmitry Torokhov:
"A fix for recent sysfs breakage in serio subsystem plus a fixup to
adxl34x driver"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
Input: adxl34x - Fix bug in definition of ADXL346_2D_ORIENT
Input: serio - fix sysfs layout
Diffstat (limited to 'include')
0 files changed, 0 insertions, 0 deletions