git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
d50f58b
e69edc7
)
Merge branch 'arm/booting' of git://git.pengutronix.de/git/ukl/linux-2.6 into devel...
author
Russell King
<rmk+kernel@arm.linux.org.uk>
Thu, 29 Jul 2010 21:27:56 +0000
(22:27 +0100)
committer
Russell King
<rmk+kernel@arm.linux.org.uk>
Thu, 29 Jul 2010 21:27:56 +0000
(22:27 +0100)
Conflicts:
arch/arm/Kconfig
Trivial merge