[kernel: 2/2] fix arm merge

[Peter Robinson]

commit b478a814eea2d11705c9060f0dd4604ef7a7c5b5
Merge: b597cbb ea6c81b
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Mon May 5 22:50:43 2014 +0100

    fix arm merge

 kernel.spec |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)
---
diff --cc kernel.spec
index c9dcdb0,0a0ece6..e44a5e7
--- a/kernel.spec
+++ b/kernel.spec
@@@ -2225,9 -2229,10 +2229,13 @@@ f
  #                                    ||----w |
  #                                    ||     ||
  %changelog
 +* Mon May  5 2014 Peter Robinson <pbrobinson at fedoraproject.org>
 +- Fix some USB on ARM LPAE kernels
 +
+ * Mon May 05 2014 Kyle McMartin <kyle at fedoraproject.org>
+ - Install arch/arm/include/asm/xen headers on aarch64, since the headers in
+   arch/arm64/include/asm/xen reference them.
+ 
  * Mon May 05 2014 Josh Boyer <jwboyer at fedoraproject.org> - 3.15.0-0.rc4.git0.1
  - Linux v3.15-rc4
  - Disable debugging options.