diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-03-25 23:55:54 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-03-25 23:55:54 +0100 |
| commit | 18bbff9f679cd470db66402fdb9c577b34324183 (patch) | |
| tree | f8e90adadfde630368034268de8cc5763898ab37 /arch/arm/mach-sa1100/cpu-sa1100.c | |
| parent | e7d863d0f42e2cf19a13c867bfcab7424388bff8 (diff) | |
| parent | 7cb66dcc828662c8cacb74af08478433cef102b1 (diff) | |
Merge branch 'sa11x0-lcd' into sa11x0
Conflicts:
arch/arm/mach-sa1100/assabet.c
Diffstat (limited to 'arch/arm/mach-sa1100/cpu-sa1100.c')
0 files changed, 0 insertions, 0 deletions