summaryrefslogtreecommitdiff
path: root/drivers/input
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2014-01-21 21:26:33 +0000
committerRussell King <rmk+kernel@arm.linux.org.uk>2014-01-21 21:26:33 +0000
commit6f14d778c15fe08b6d98e759cf7e3893ed67b238 (patch)
treea0ac861030ad46d7b8f189bb851e53b75100d27a /drivers/input
parentd6e0a2dd12f4067a5bcefb8bbd8ddbeff800afbc (diff)
parent5303c0f46c8708fff4148ebcc491f78710356952 (diff)
parentb25f3e1c358434bf850220e04f28eebfc45eb634 (diff)
parent71b55663c5d0a6f8473045db1c8b376803780191 (diff)
parent668bc38669f9a6d5e91846e9435b22b196cee9d1 (diff)
parent162e68c08c916d0b701331a85291537fed2ad537 (diff)
downloadlwn-6f14d778c15fe08b6d98e759cf7e3893ed67b238.tar.gz
lwn-6f14d778c15fe08b6d98e759cf7e3893ed67b238.zip
Merge branches 'amba', 'fixes', 'kees', 'misc' and 'unstable/sa11x0' into for-next