diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-31 13:02:34 +1000 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-31 13:02:34 +1000 |
| commit | 1ca05b7fc2672ea870bd58f45dc8d36d2b980f94 (patch) | |
| tree | 7dc8da0d6e0ad9d115fa81504b9cbdc9c372506f /drivers/media | |
| parent | aa5bd67dcfdf9af34c7fa36ebc87d4e1f7e91873 (diff) | |
| parent | c63fe0a41fd2374be0ebe93c053820a0eed9cefe (diff) | |
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
Diffstat (limited to 'drivers/media')
0 files changed, 0 insertions, 0 deletions