diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2009-04-30 21:12:13 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2009-04-30 21:16:49 +0200 |
| commit | 3c56999eec7acc105a31b4546c94aad2fb844b13 (patch) | |
| tree | 293aef41f1441875323541cbc4f790c291b83679 /sound | |
| parent | bad760089c1ef7fe525c0f268a4078b9cb483903 (diff) | |
| parent | 12d161147f828192b5bcc33166f468a827832767 (diff) | |
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>
Diffstat (limited to 'sound')
0 files changed, 0 insertions, 0 deletions