git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
bad7600
12d1611
)
Merge branch 'core/signal' into perfcounters/core
author
Thomas Gleixner
<tglx@linutronix.de>
Thu, 30 Apr 2009 19:12:13 +0000
(21:12 +0200)
committer
Thomas Gleixner
<tglx@linutronix.de>
Thu, 30 Apr 2009 19:16:49 +0000
(21:16 +0200)
This is necessary to avoid the conflict of syscall numbers.
Conflicts:
arch/x86/ia32/ia32entry.S
arch/x86/include/asm/unistd_32.h
arch/x86/include/asm/unistd_64.h
Fixes up the borked syscall numbers of perfcounters versus
preadv/pwritev as well.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff