[kernel: 2/2] fix merge

[Peter Robinson]

commit 078f71f7dd25bb8acc5a706cc92c3109c65bf118
Merge: 83ef26c 9608524
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Mon Mar 4 11:44:24 2013 +0000

    fix merge

 config-debug   |    1 +
 config-generic |    3 +++
 config-nodebug |    1 +
 kernel.spec    |    5 ++++-
 sources        |    2 +-
 5 files changed, 10 insertions(+), 2 deletions(-)
---
diff --cc kernel.spec
index a2ffe2a,398af40..55b9fd4
--- a/kernel.spec
+++ b/kernel.spec
@@@ -2270,9 -2267,9 +2270,12 @@@ f
  #                 ||----w |
  #                 ||     ||
  %changelog
 +* Mon Mar  4 2013 Peter Robinson <pbrobinson at fedoraproject.org>
 +- Minor ARM updates
 +
+ * Sun Mar 03 2013 Josh Boyer <jwboyer at redhat.com> - 3.9.0-0.rc0.git15.1
+ - Linux v3.8-10734-ga7c1120
+ 
  * Fri Mar 01 2013 Josh Boyer <jwboyer at redhat.com> - 3.9.0-0.rc0.git14.1
  - Linux v3.8-10206-gb0af9cd