aboutsummaryrefslogtreecommitdiffstats
path: root/arch/s390/include/uapi/asm/kvm_para.h
diff options
context:
space:
mode:
authorMartin Schwidefsky <schwidefsky@de.ibm.com>2012-10-09 08:18:10 -0400
committerMartin Schwidefsky <schwidefsky@de.ibm.com>2012-10-09 08:18:10 -0400
commitab08ff34b44f752b664ebb312d2e110cf37a7f5e (patch)
tree80579bb79480ac303cad99c359549d4e86bcc773 /arch/s390/include/uapi/asm/kvm_para.h
parent450e47da67499aeb6f1700e8f84747460c11ab56 (diff)
parent9807f75955ea7f1877981056755284481873115c (diff)
Merge tag 'disintegrate-s390-20121009' of
git://git.infradead.org/users/dhowells/linux-headers Pull UAPI patchset from David Howells: "Can you merge the following branch into the s390 tree please. This is to complete part of the UAPI disintegration for which the preparatory patches were pulled recently." Conflicts: arch/s390/include/asm/chpid.h
Diffstat (limited to 'arch/s390/include/uapi/asm/kvm_para.h')
-rw-r--r--arch/s390/include/uapi/asm/kvm_para.h0
1 files changed, 0 insertions, 0 deletions
diff --git a/arch/s390/include/uapi/asm/kvm_para.h b/arch/s390/include/uapi/asm/kvm_para.h
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/arch/s390/include/uapi/asm/kvm_para.h