git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
62c132a
9b1489e
)
Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6 into devel-stable
author
Russell King
<rmk+kernel@arm.linux.org.uk>
Tue, 2 Mar 2010 23:29:32 +0000
(23:29 +0000)
committer
Russell King
<rmk+kernel@arm.linux.org.uk>
Tue, 2 Mar 2010 23:29:32 +0000
(23:29 +0000)
Conflicts:
arch/arm/Makefile
Trivial merge