git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
09a0729
6a5a0b9
)
Merge branch 'master' into sh/hw-breakpoints
author
Paul Mundt
<lethal@linux-sh.org>
Tue, 8 Dec 2009 06:47:12 +0000
(15:47 +0900)
committer
Paul Mundt
<lethal@linux-sh.org>
Tue, 8 Dec 2009 06:47:12 +0000
(15:47 +0900)
Conflict between FPU thread flag migration and debug
thread flag addition.
Conflicts:
arch/sh/include/asm/thread_info.h
arch/sh/include/asm/ubc.h
arch/sh/kernel/process_32.c
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff