git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
be6786a
1a0b1ea
)
Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/genesis-2.6 into devel-stable
author
Russell King
<rmk+kernel@arm.linux.org.uk>
Thu, 28 Oct 2010 19:14:38 +0000
(20:14 +0100)
committer
Russell King
<rmk+kernel@arm.linux.org.uk>
Thu, 28 Oct 2010 19:14:38 +0000
(20:14 +0100)
Conflicts:
drivers/video/sh_mobile_hdmi.c
Trivial merge