[kernel: 2/3] Merge fixup

[Justin M. Forbes]

commit 3be53ac5269e59a93502efc0199e222a91a89366
Merge: d8c9baa fc31f43
Author: Justin M. Forbes <jforbes at redhat.com>
Date:   Mon Apr 2 15:45:30 2012 -0500

    Merge fixup

 Makefile    |    7 +------
 kernel.spec |    5 ++++-
 2 files changed, 5 insertions(+), 7 deletions(-)
---
diff --cc kernel.spec
index 47297e1,5044b05..363068a
--- a/kernel.spec
+++ b/kernel.spec
@@@ -2283,12 -2291,9 +2283,15 @@@ f
  #                 ||----w |
  #                 ||     ||
  %changelog
 +* Mon Apr 02 2012 Justin M. Forbes <jforbes at redhat.com> - 3.4.0-0.rc1
 +- Linux v3.4-rc1
 +
 +* Fri Mar 30 2012 Justin M. Forbes <jforbes at redhat.com> - 3.4.0-0.rc0.git5.1
 +- Linux v3.3-9295-gf52b69f
 +
+ * Fri Mar 30 2012 Dave Jones <davej at redhat.com>
+ - Change config parsing to use {_target_cpu} (From Niels de Vos)
+ 
  * Thu Mar 29 2012 Justin M. Forbes <jforbes at redhat.com> - 3.4.0-0.rc0.git4.1
  - Linux v3.3-8839-gb5174fa