git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
144c749
763008c
)
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
author
Paul Mundt
<lethal@linux-sh.org>
Fri, 20 Aug 2010 11:52:23 +0000
(20:52 +0900)
committer
Paul Mundt
<lethal@linux-sh.org>
Fri, 20 Aug 2010 11:52:23 +0000
(20:52 +0900)
Conflicts:
arch/sh/kernel/process_32.c
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff