git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
9ae21ca
cbff3eb
)
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>
Thu, 28 Oct 2010 11:27:34 +0000
(12:27 +0100)
committer
Russell King
<rmk+kernel@arm.linux.org.uk>
Thu, 28 Oct 2010 11:27:34 +0000
(12:27 +0100)
Conflicts:
arch/arm/mach-s3c64xx/dev-audio.c
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff