diff options
author | Ingo Molnar <mingo@kernel.org> | 2013-11-06 06:50:21 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2013-11-06 06:50:21 +0100 |
commit | 164777530b8853d92b52956312078190e2c5eeb1 (patch) | |
tree | 88fa0de7577b106837f041d00dce12a1fa6d2ac6 /arch/x86/kernel/pci-swiotlb.c | |
parent | 09dc68d958c67c76cf672ec78b7391af453010f8 (diff) | |
parent | 5e01dc7b26d9f24f39abace5da98ccbd6a5ceb52 (diff) |
Merge tag 'v3.12' into x86/cpu, to refresh the branch before queueing up more changes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/kernel/pci-swiotlb.c')
0 files changed, 0 insertions, 0 deletions