summaryrefslogtreecommitdiffstats
path: root/drivers/input/touchscreen
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2011-03-20 10:32:12 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2011-03-20 10:32:12 +0100
commit196f020fbbb83d246960548e73a40fd08f3e7866 (patch)
treeaed9fa4c32938a4502eb8971dce18f74f0059162 /drivers/input/touchscreen
parentMerge branches 'defcfg', 'drivers' and 'cyberpro-next' of master.kernel.org:/... (diff)
parentARM: 6797/1: hw_breakpoint: Fix newlines in WARNings (diff)
parentARM: pgtable: add pud-level code (diff)
parentARM: 6751/1: vexpress: select applicable errata workarounds in Kconfig (diff)
downloadlinux-196f020fbbb83d246960548e73a40fd08f3e7866.tar.xz
linux-196f020fbbb83d246960548e73a40fd08f3e7866.zip
Merge branches 'fixes', 'pgt-next' and 'versatile' into devel