tree b0efc68dd122fd51ffeffa26a396e2f01336bf62
parent 35e51fe82ddcd8fb7f129d6dd8491c097d388665
parent 4fecc2088fd02ce8a6580c12822987d3c6bab9b8
author Linus Torvalds <torvalds@linux-foundation.org> 1312444809 -1000
committer Linus Torvalds <torvalds@linux-foundation.org> 1312444809 -1000

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