summaryrefslogtreecommitdiff
path: root/ring_tx.h
diff options
context:
space:
mode:
Diffstat (limited to 'ring_tx.h')
0 files changed, 0 insertions, 0 deletions
eacbc66a9f5c27147a6ea975211ae82281044 /arch parent3596f5bb0a6afd01a784bfe120f420edbbf82861 (diff)parent949db153b6466c6f7cad5a427ecea94985927311 (diff)
Merge tag 'v3.8-rc5' into x86/mm
The __pa() fixup series that follows touches KVM code that is not present in the existing branch based on v3.7-rc5, so merge in the current upstream from Linus. Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
Diffstat (limited to 'arch')