| commit | 85fe20bfd415af0a2e93bd1166533d4a6eb591ea | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Sun Feb 28 10:37:40 2010 -0800 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Sun Feb 28 10:37:40 2010 -0800 |
| tree | 10b0e485712859327f0c800491fb787a1859f0b6 | |
| parent | 58f02db466900003b801bdfdeddc4d96ce42b7d5 [diff] | |
| parent | 1c5b9069e12e20d2fe883076ae0bf73966492108 [diff] |
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