From: Thomas Gleixner <tglx@linutronix.de>
Date: Thu, 30 Apr 2009 19:12:13 +0000 (+0200)
Subject: Merge branch 'core/signal' into perfcounters/core
X-Git-Tag: v2.6.31-rc1~383^2~318
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3c56999eec7acc105a31b4546c94aad2fb844b13;p=pandora-kernel.git

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>
---

3c56999eec7acc105a31b4546c94aad2fb844b13
Reading git-diff-tree failed