git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
f165eb7
beccb12
)
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>
Fri, 6 Aug 2010 17:13:19 +0000
(18:13 +0100)
committer
Russell King
<rmk+kernel@arm.linux.org.uk>
Fri, 6 Aug 2010 17:13:19 +0000
(18:13 +0100)
Conflicts:
drivers/net/irda/sh_irda.c
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff