git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
9b963f3
b0b6ff0
)
Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux...
author
Russell King
<rmk+kernel@arm.linux.org.uk>
Tue, 15 Mar 2011 16:32:47 +0000
(16:32 +0000)
committer
Russell King
<rmk+kernel@arm.linux.org.uk>
Tue, 15 Mar 2011 16:32:47 +0000
(16:32 +0000)
Conflicts:
arch/arm/mm/Kconfig
Trivial merge