From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 4 Aug 2011 08:00:09 +0000 (-1000)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
X-Git-Tag: Ubuntu-snapdragon-4.4.0-1050.54~16749
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=0ea648441a189f6e3e90a25c74511738799a0c7a;p=mirror_ubuntu-artful-kernel.git

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

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
  Input: ad7879 - fix deficient device disable
  Input: gpio_keys - fix two typos in devicetree documentation
  Input: mma8450 - add device tree probe support
  Input: gpio_keys - return proper error code if memory allocation fails
  Input: lm8323 - add missing device_remove_file for dev_attr_time
  Input: tegra-kbc - fix computation of polling time
  Input: kxtj9 - explicitly include module.h
  Input: psmouse - hgpk.c needs module.h
---

0ea648441a189f6e3e90a25c74511738799a0c7a