diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-07-12 16:43:36 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-07-12 16:43:36 -0400 |
| commit | 5a58d4bb66b1d68e4b9319dd5b89078bad2a7f64 (patch) | |
| tree | 7e3c7dd69ba19b41d11ff8f08f2906443a72a5e6 /arch/arm/mach-pxa/trizeps4.c | |
| parent | 7fecc34e07e02b4d9dab1a1f4bf7fdac0a656b9b (diff) | |
| parent | ac2536109849217a71510b6ded813e91629e88f6 (diff) | |
Merge branch 'eseries' into pxa
Conflicts:
arch/arm/mach-pxa/Makefile
Diffstat (limited to 'arch/arm/mach-pxa/trizeps4.c')
0 files changed, 0 insertions, 0 deletions