From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 12 Jan 2012 20:40:41 +0000 (-0800)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
X-Git-Tag: firefly_0821_release~3680^2~3735
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=2485a4b610171f4e1c4ab0d053569747795c1bbe;p=firefly-linux-kernel-4.4.55.git

Merge branch 'for-linus' of git://git./linux/kernel/git/dtor/input

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
  Input: bcm5974 - set BUTTONPAD property
  Input: serio_raw - return proper result when serio_raw_write fails
  Input: serio_raw - really signal HUP upon disconnect
  Input: serio_raw - remove stray semicolon
  Input: revert some over-zealous conversions to module_platform_driver()
---

2485a4b610171f4e1c4ab0d053569747795c1bbe