From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 23 Sep 2009 15:29:57 +0000 (-0700)
Subject: Merge branch 'x86/orig_ax' of git://git.kernel.org/pub/scm/linux/kernel/git/frob... 
X-Git-Tag: v2.6.32-rc1~179
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=547ad5ac665234953e32678f6a32385b58edefc3;p=~shefty%2Frdma-dev.git

Merge branch 'x86/orig_ax' of git://git.kernel.org/pub/scm/linux/kernel/git/frob/linux-2.6-roland

* 'x86/orig_ax' of git://git.kernel.org/pub/scm/linux/kernel/git/frob/linux-2.6-roland:
  x86: ptrace: set TS_COMPAT when 32-bit ptrace sets orig_eax>=0
  x86: ptrace: do not sign-extend orig_ax on write
  x86: syscall_get_nr returns int
  asm-generic: syscall_get_nr returns int
---

547ad5ac665234953e32678f6a32385b58edefc3