git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
ae1a25d
432dc14
)
Merge branch 'devel' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa...
author
Russell King
<rmk@dyn-67.arm.linux.org.uk>
Sat, 7 Feb 2009 21:43:28 +0000
(21:43 +0000)
committer
Russell King
<rmk+kernel@arm.linux.org.uk>
Sat, 7 Feb 2009 21:43:28 +0000
(21:43 +0000)
Conflicts:
arch/arm/configs/magician_defconfig
Trivial merge