git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
cc511b8
2e3d256
)
Merge branch 'for-russell' of git://hansjkoch.de/git/linux-tcc into HEAD
author
Russell King
<rmk+kernel@arm.linux.org.uk>
Thu, 5 Jan 2012 12:55:03 +0000
(12:55 +0000)
committer
Russell King
<rmk+kernel@arm.linux.org.uk>
Thu, 5 Jan 2012 12:55:03 +0000
(12:55 +0000)
Conflicts:
arch/arm/plat-omap/include/plat/common.h
Trivial merge