Thomas Gleixner 3c56999eec Merge branch 'core/signal' into perfcounters/core ... 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>		2009-04-30 21:16:49 +02:00
..
asm	Merge branch 'core/signal' into perfcounters/core	2009-04-30 21:16:49 +02:00