]> nv-tegra.nvidia Code Review - linux-3.10.git/commitdiff
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 31 Jan 2011 03:02:34 +0000 (13:02 +1000)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 31 Jan 2011 03:02:34 +0000 (13:02 +1000)
* '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


Trivial merge