From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 12 May 2016 19:47:49 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
X-Git-Tag: Ubuntu-4.10.0-19.21~3429
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=ed1e33dded773ead96d047a34286e27feafd0505;p=mirror_ubuntu-artful-kernel.git

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

Pull input subsystem fixes from Dmitry Torokhov.

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
  Input: twl6040-vibra - fix DT node memory management
  Input: max8997-haptic - fix NULL pointer dereference
  Input: byd - update copyright header
---

ed1e33dded773ead96d047a34286e27feafd0505