Merge tag 'kvms390-20140626' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390...
authorPaolo Bonzini <pbonzini@redhat.com>
Fri, 27 Jun 2014 14:19:39 +0000 (16:19 +0200)
committerPaolo Bonzini <pbonzini@redhat.com>
Fri, 27 Jun 2014 14:19:39 +0000 (16:19 +0200)
commit0c2363ffec4d99f8602f94d5b3f7747fe54ab679
tree79a4975ff8f9b7938c73963b8811c05a65d99708
parent8c9eb041cf76038eb3b62ee259607eec9b89f48d
parentd09a08e030acbb41aadf7fee7b31cb1c5391bb96
Merge tag 'kvms390-20140626' of git://git./linux/kernel/git/kvms390/linux into kvm-master

Fix sie.h header related problems introduced during the 3.16 development
cycle.