]> git.karo-electronics.de Git - mv-sheeva.git/commit - arch/arm/mach-omap2/omap_hwmod_2430_data.c
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)
commit1ca05b7fc2672ea870bd58f45dc8d36d2b980f94
tree7dc8da0d6e0ad9d115fa81504b9cbdc9c372506f
parentaa5bd67dcfdf9af34c7fa36ebc87d4e1f7e91873
parentc63fe0a41fd2374be0ebe93c053820a0eed9cefe
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: 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