Merge branch 'x86-io-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 28 Feb 2010 18:37:40 +0000 (10:37 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 28 Feb 2010 18:37:40 +0000 (10:37 -0800)
commit85fe20bfd415af0a2e93bd1166533d4a6eb591ea
tree10b0e485712859327f0c800491fb787a1859f0b6
parent58f02db466900003b801bdfdeddc4d96ce42b7d5
parent1c5b9069e12e20d2fe883076ae0bf73966492108
Merge branch 'x86-io-for-linus' of git://git./linux/kernel/git/tip/linux-2.6-tip

* 'x86-io-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86: Merge io.h
  x86: Simplify flush_write_buffers()
  x86: Clean up mem*io functions.
  x86-64: Use BUILDIO in io_64.h
  x86-64: Reorganize io_64.h
  x86-32: Remove _local variants of in/out from io_32.h
  x86-32: Move XQUAD definitions to numaq.h
arch/x86/lib/Makefile