From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 28 Feb 2010 18:37:40 +0000 (-0800)
Subject: Merge branch 'x86-io-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v2.6.34-rc1~256
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=85fe20bfd415af0a2e93bd1166533d4a6eb591ea;p=linux.git

Merge branch 'x86-io-for-linus' of git://git.kernel.org/pub/scm/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
---

85fe20bfd415af0a2e93bd1166533d4a6eb591ea