git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
2c23d62
387e2b0
)
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
author
David Woodhouse
<dwmw2@infradead.org>
Wed, 24 May 2006 08:22:21 +0000
(09:22 +0100)
committer
David Woodhouse
<dwmw2@infradead.org>
Wed, 24 May 2006 08:22:21 +0000
(09:22 +0100)
Conflicts:
include/asm-powerpc/unistd.h
include/asm-sparc/unistd.h
include/asm-sparc64/unistd.h
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff