| commit | 18bbff9f679cd470db66402fdb9c577b34324183 | [log] [tgz] |
|---|---|---|
| author | Russell King <rmk+kernel@arm.linux.org.uk> | Sun Mar 25 23:55:54 2012 +0100 |
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | Sun Mar 25 23:55:54 2012 +0100 |
| tree | f8e90adadfde630368034268de8cc5763898ab37 | |
| parent | e7d863d0f42e2cf19a13c867bfcab7424388bff8 [diff] | |
| parent | 7cb66dcc828662c8cacb74af08478433cef102b1 [diff] |
Merge branch 'sa11x0-lcd' into sa11x0 Conflicts: arch/arm/mach-sa1100/assabet.c