git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
9f5974c
624cee3
)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc-merge
author
Linus Torvalds
<torvalds@g5.osdl.org>
Thu, 12 Jan 2006 18:21:22 +0000
(10:21 -0800)
committer
Linus Torvalds
<torvalds@g5.osdl.org>
Thu, 12 Jan 2006 18:21:22 +0000
(10:21 -0800)
Fix up delete/modify conflict of arch/ppc/kernel/process.c by hand (it's
gone, gone, gone).
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff