tree b1a3fd2e9dd3846d5d30c5e75c79db1ad31c0d80
parent 846f29a6afb5f272ee1c8b2a57c5730ab31eabaa
parent 241ecf1ce528804d5ffc8fb386ff2a01b1f937c4
author Linus Torvalds <torvalds@linux-foundation.org> 1386882827 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1386882827 -0800

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