git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
6d0485a
135cad3
)
Merge branch 'for-rmk-devel' of git://git.pengutronix.de/git/imx/linux-2.6 into devel
author
Russell King
<rmk@dyn-67.arm.linux.org.uk>
Sat, 23 May 2009 19:57:31 +0000
(20:57 +0100)
committer
Russell King
<rmk+kernel@arm.linux.org.uk>
Sat, 23 May 2009 19:57:31 +0000
(20:57 +0100)
Conflicts:
arch/arm/Kconfig
arch/arm/Makefile
Trivial merge