From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 31 Jan 2011 03:02:34 +0000 (+1000)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
X-Git-Tag: v2.6.38-rc3~12
X-Git-Url: http://git.cascardo.info/?p=cascardo%2Flinux.git;a=commitdiff_plain;h=1ca05b7fc2672ea870bd58f45dc8d36d2b980f94

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: synaptics - retry failed resets when reconnecting
  Input: synaptics - fix reconnect logic on MT devices
  Input: tegra-kbc - fix keymap entry for LeftMeta key
  Input: tegra-kbc - fix build error
---

1ca05b7fc2672ea870bd58f45dc8d36d2b980f94