[kernel: 2/2] merge fixup

[Justin M. Forbes]

commit 1ae0b0fe93f0c4e6166fc45a7d43a2d0bffd51fc
Merge: fc85362 8c03996
Author: Justin M. Forbes <jforbes at redhat.com>
Date:   Fri Oct 5 10:47:26 2012 -0500

    merge fixup

 config-arm-generic        |    7 ++
 config-arm-kirkwood       |    4 +
 config-arm-omap           |    9 +++
 config-arm-tegra          |    8 ++
 kernel.spec               |   19 ++++-
 modsign-post-KS-jwb.patch |  174 +++++++++++++++++++++++++++++++++++++++++++++
 6 files changed, 218 insertions(+), 3 deletions(-)
---
diff --cc kernel.spec
index 0001efb,c379793..2b4671c
--- a/kernel.spec
+++ b/kernel.spec
@@@ -2312,10 -2321,18 +2313,22 @@@ f
  #                 ||----w |
  #                 ||     ||
  %changelog
 +* Fri Oct 05 2012 Justin M. Forbes <jforbes at redhat.com> 
 +- v3.6-6670-gecefbd9
 +- Reenable debugging options.
 +
+ * Fri Oct  5 2012 Peter Robinson <pbrobinson at fedoraproject.org>
+ - Build MMC in on OMAP and Tegra until we work out why modules don't work
+ 
+ * Wed Oct 03 2012 Adam Jackson <ajax at redhat.com>
+ - Drop vgem patches, not doing anything yet.
+ 
+ * Wed Oct 03 2012 Josh Boyer <jwboyer at redhat.com>
+ - Make sure kernel-tools-libs-devel provides kernel-tools-devel
+ 
+ * Tue Oct 02 2012 Josh Boyer <jwboyer at redhat.com>
+ - Patch from David Howells to fix overflow on 32-bit X.509 certs (rhbz 861322)
+ 
  * Tue Oct  2 2012 Peter Robinson <pbrobinson at fedoraproject.org>
  - Update ARM configs for 3.6 final
  - Add highbank SATA driver for stability