git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
18bbff9
6ed3e2a
)
Merge branch 'sa11x0-mcp' into sa11x0
author
Russell King
<rmk+kernel@arm.linux.org.uk>
Sun, 25 Mar 2012 22:56:30 +0000
(23:56 +0100)
committer
Russell King
<rmk+kernel@arm.linux.org.uk>
Sun, 25 Mar 2012 22:57:10 +0000
(23:57 +0100)
Conflicts:
arch/arm/mach-sa1100/assabet.c
arch/arm/mach-sa1100/collie.c
arch/arm/mach-sa1100/generic.c
arch/arm/mach-sa1100/lart.c
arch/arm/mach-sa1100/shannon.c
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff