From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 12 Nov 2010 17:52:31 +0000 (-0800)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
X-Git-Tag: v2.6.37-rc2~28
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7803c05429c7ca4e62fc3468791b7da224866305;p=profile%2Fivi%2Fkernel-x86-ivi.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: do not pass injected events back to the originating handler
  Input: pcf8574_keypad - fix error handling in pcf8574_kp_probe
  Input: acecad - fix a memory leak in usb_acecad_probe error path
  Input: atkbd - add 'terminal' parameter for IBM Terminal keyboards
  Input: i8042 - add Sony VAIOs to MUX blacklist
  kgdboc: reset input devices (keyboards) when exiting debugger
  Input: export input_reset_device() for use in KGDB
  Input: adp5588-keys - unify common header defines
---

7803c05429c7ca4e62fc3468791b7da224866305