diff options
| author | Ingo Molnar <[email protected]> | 2008-12-03 07:25:56 +0000 |
|---|---|---|
| committer | Ingo Molnar <[email protected]> | 2008-12-03 07:25:59 +0000 |
| commit | 6083aa485c86933ee444dc2242270d37ea4664cb (patch) | |
| tree | e2b7b9588bbf18a62bf08fcf3fda812de25cda4d /net/unix/af_unix.c | |
| parent | x86: fix broken flushing in GART nofullflush path (diff) | |
| parent | x86: provide readq()/writeq() on 32-bit too, complete (diff) | |
| download | kernel-6083aa485c86933ee444dc2242270d37ea4664cb.tar.gz kernel-6083aa485c86933ee444dc2242270d37ea4664cb.zip | |
Merge branch 'x86/io' into x86/iommu
Merge x86/io into x86/iommu due to a small patch conflict in io.h.
Diffstat (limited to 'net/unix/af_unix.c')
0 files changed, 0 insertions, 0 deletions