diff options
author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-07-12 22:43:36 +0200 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-07-12 22:43:36 +0200 |
commit | 5a58d4bb66b1d68e4b9319dd5b89078bad2a7f64 (patch) | |
tree | 7e3c7dd69ba19b41d11ff8f08f2906443a72a5e6 /arch/arm/mach-pxa/mainstone.c | |
parent | Merge branch 'pxa-tosa' into pxa (diff) | |
parent | Support for LCD on e740 e750 e400 and e800 e-series PDAs (diff) | |
download | linux-5a58d4bb66b1d68e4b9319dd5b89078bad2a7f64.tar.xz linux-5a58d4bb66b1d68e4b9319dd5b89078bad2a7f64.zip |
Merge branch 'eseries' into pxa
Conflicts:
arch/arm/mach-pxa/Makefile
Diffstat (limited to 'arch/arm/mach-pxa/mainstone.c')
0 files changed, 0 insertions, 0 deletions