From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 14 Sep 2009 14:55:37 +0000 (-0700)
Subject: Merge branch 'x86-asm-generic-for-linus' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: v2.6.32-rc1~713
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=9b74aec028e7d7ce57b8deef490e440003555520;p=karo-tx-linux.git

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

* 'x86-asm-generic-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86: remove all now-duplicate header files
  x86: convert termios.h to the asm-generic version
  x86: convert almost generic headers to asm-generic version
  x86: convert trivial headers to asm-generic version
  x86: add copies of some headers to convert to asm-generic
---

9b74aec028e7d7ce57b8deef490e440003555520