[kernel/f17: 2/2] fix merge with ARM

[Peter Robinson]

commit 1fc4e2217f223df8bb507b83096652c0533a9d0c
Merge: aeb97b1 9580bc3
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Mon Oct 22 10:16:09 2012 +0100

    fix merge with ARM

 config-generic |    4 ++--
 kernel.spec    |    3 +++
 2 files changed, 5 insertions(+), 2 deletions(-)
---
diff --cc kernel.spec
index 7e51a19,da6a7e2..75009e0
--- a/kernel.spec
+++ b/kernel.spec
@@@ -2322,11 -2327,9 +2322,14 @@@ f
  #    '-'      |  |
  #              '-'
  %changelog
 +* Mon Oct 22 2012 Peter Robinson <pbrobinson at fedoraproject.org>
 +- Cleanup ARM patches
 +- Add highbank sata patch
 +- add patch to revert ARM misaligned access check to stop kernel OOPS
 +
+ * Sun Oct 21 2012 Josh Boyer <jwboyer at redhat.com>
+ - Don't enable UDL per Dave Airlie
+ 
  * Thu Oct 18 2012 Josh Boyer <jwboyer at redhat.com>
  - Patch to have mac80211 connect with HT20 if HT40 is not allowed (rhbz 866013)
  - Enable VFIO (rhbz 867152)