git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e7d863d 7cb66dc)
Merge branch 'sa11x0-lcd' into sa11x0
authorRussell King <rmk+kernel@arm.linux.org.uk>
Sun, 25 Mar 2012 22:55:54 +0000 (23:55 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Sun, 25 Mar 2012 22:55:54 +0000 (23:55 +0100)
Conflicts:
arch/arm/mach-sa1100/assabet.c


Trivial merge
Pandora Kernel Repository