git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
64ed28a
d608c73
)
Merge branch 'for-rmk/samsung5' of git://git.fluff.org/bjdooks/linux into devel-stable
author
Russell King
<rmk+kernel@arm.linux.org.uk>
Tue, 2 Mar 2010 23:40:15 +0000
(23:40 +0000)
committer
Russell King
<rmk+kernel@arm.linux.org.uk>
Tue, 2 Mar 2010 23:40:15 +0000
(23:40 +0000)
Conflicts:
arch/arm/Kconfig
arch/arm/Makefile
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff