From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 22 Nov 2011 17:18:06 +0000 (-0800)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=866d43c9ea88daa3751b58aba16a2a9b7f7aa067;p=GitHub%2FLineageOS%2Fandroid_kernel_samsung_universal7580.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: ams_delta_serio - include linux/module.h
  Input: elantech - adjust hw_version detection logic
  Input: i8042 - add HP Pavilion dv4s to 'notimeout' and 'nomux' blacklists
---

866d43c9ea88daa3751b58aba16a2a9b7f7aa067