git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
3560adf
4e6d488
)
Merge branch 'tmpreg' into devel
author
Russell King
<rmk+kernel@arm.linux.org.uk>
Thu, 25 Feb 2010 22:07:25 +0000
(22:07 +0000)
committer
Russell King
<rmk+kernel@arm.linux.org.uk>
Thu, 25 Feb 2010 22:07:25 +0000
(22:07 +0000)
Conflicts:
arch/arm/Kconfig
arch/arm/mach-ux500/include/mach/debug-macro.S
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff