git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
fbae0f8
81e6ca3
)
Merge branch 'sa1111' into sa11x0
author
Russell King
<rmk+kernel@arm.linux.org.uk>
Sun, 25 Mar 2012 22:54:16 +0000
(23:54 +0100)
committer
Russell King
<rmk+kernel@arm.linux.org.uk>
Sun, 25 Mar 2012 22:54:16 +0000
(23:54 +0100)
Conflicts:
arch/arm/common/sa1111.c
arch/arm/mach-sa1100/neponset.c
Fixed:
arch/arm/mach-sa1100/assabet.c
for the neponset changes
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff