git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
1db3706
4fb0d2e
)
Merge branch 'for-rmk' of git://linux-arm.org/linux-2.6-wd into devel-stable
author
Russell King
<rmk+kernel@arm.linux.org.uk>
Fri, 16 Sep 2011 20:45:16 +0000
(21:45 +0100)
committer
Russell King
<rmk+kernel@arm.linux.org.uk>
Fri, 16 Sep 2011 20:45:16 +0000
(21:45 +0100)
Conflicts:
arch/arm/mach-imx/mach-cpuimx27.c
Trivial merge