From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 12 Dec 2013 21:13:47 +0000 (-0800)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
X-Git-Tag: v3.13-rc4~24
X-Git-Url: http://pileus.org/git/?a=commitdiff_plain;h=ea4ebd1cb093c8ec5d7f4bf9070dc444184c3971;p=~andy%2Flinux

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
---

ea4ebd1cb093c8ec5d7f4bf9070dc444184c3971