tree c6804dba556f981ce1a2363582dbbd9a55e85489
parent b581af5110ab62db3a33f86ea7531d5f898a520c
parent 73a2d096fdf23aa841f7595d114a11ec85a85e4d
author Linus Torvalds <torvalds@linux-foundation.org> 1252940137 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1252940137 -0700

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