diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-03-20 10:32:12 +0100 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-03-20 10:32:12 +0100 |
commit | 196f020fbbb83d246960548e73a40fd08f3e7866 (patch) | |
tree | aed9fa4c32938a4502eb8971dce18f74f0059162 /drivers/video/amba-clcd.c | |
parent | Merge branches 'defcfg', 'drivers' and 'cyberpro-next' of master.kernel.org:/... (diff) | |
parent | ARM: 6797/1: hw_breakpoint: Fix newlines in WARNings (diff) | |
parent | ARM: pgtable: add pud-level code (diff) | |
parent | ARM: 6751/1: vexpress: select applicable errata workarounds in Kconfig (diff) | |
download | linux-196f020fbbb83d246960548e73a40fd08f3e7866.tar.xz linux-196f020fbbb83d246960548e73a40fd08f3e7866.zip |
Merge branches 'fixes', 'pgt-next' and 'versatile' into devel