git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
7622537
8716011
4fec997
de4338f
47ab0de
2a84751
8834133
3e9cc70
4c18e77
f417cba
)
Merge branches 'at91', 'bcmring', 'ep93xx', 'iop', 'misc', 'nomadik', 'omap', 'pxa...
author
Russell King
<rmk+kernel@arm.linux.org.uk>
Mon, 17 May 2010 10:52:31 +0000
(11:52 +0100)
committer
Russell King
<rmk+kernel@arm.linux.org.uk>
Mon, 17 May 2010 10:53:39 +0000
(11:53 +0100)
Conflicts:
arch/arm/Makefile
arch/arm/common/Makefile
arch/arm/mm/Kconfig
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff