[kernel: 2/2] Merge cleanup

[Justin M. Forbes]

commit 5e9e2f5b1611a0b2acd741e8dd9fb4bbf90106e2
Merge: 4f8c60a 993b519
Author: Justin M. Forbes <jforbes at redhat.com>
Date:   Thu Mar 29 14:41:59 2012 -0500

    Merge cleanup

 kernel.spec                                        |   10 ++++-
 mod-extra.list                                     |    2 -
 ...move-cpuinitdata-for-disable_nx-on-x86_32.patch |   47 ++++++++++++++++++++
 3 files changed, 56 insertions(+), 3 deletions(-)
---
diff --cc kernel.spec
index 4b0bb26,f1a7817..b4cff0f
--- a/kernel.spec
+++ b/kernel.spec
@@@ -2289,9 -2309,12 +2291,15 @@@ f
  #                 ||----w |
  #                 ||     ||
  %changelog
 +* Thu Mar 29 2012 Justin M. Forbes <jforbes at redhat.com> - 3.4.0-0.rc0.git4.1
 +- Linux v3.3-8839-gb5174fa
 +
+ * Thu Mar 29 2012 Josh Boyer <jwboyer at redhat.com>
+ - Drop __cpuinitdata on disable_nx for x86_32 (rhbz 808075)
+ 
+ * Wed Mar 28 2012 Josh Boyer <jwboyer at redhat.com>
+ - Move 9p modules back to main package for KVM (rhbz 807733)
+ 
  * Wed Mar 28 2012 Justin M. Forbes <jforbes at redhat.com> - 3.4.0-0.rc0.git3.1
  - Linux v3.3-7919-g6658a69