From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 10 Jun 2009 22:49:10 +0000 (-0700)
Subject: Merge branch 'x86-asm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v2.6.31-rc1~419
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=aa98936e4f423dc2706771368598b04870059d14;p=platform%2Fupstream%2Fkernel-adaptation-pc.git

Merge branch 'x86-asm-for-linus' of git://git./linux/kernel/git/tip/linux-2.6-tip

* 'x86-asm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86, 64-bit: ifdef out struct thread_struct::ip
  x86, 32-bit: ifdef out struct thread_struct::fs
  x86: clean up alternative.h
---

aa98936e4f423dc2706771368598b04870059d14