[kernel/f15: 2/2] Merge branch 'f15' of ssh://pkgs.fedoraproject.org/kernel into f15

[Chuck Ebbert]

commit 5b15064ed1a7e060ff46a830f9cec68de4bb4b92
Merge: d6189c7 f2b0200
Author: Chuck Ebbert <cebbert at redhat.com>
Date:   Tue Aug 30 09:22:15 2011 -0400

    Merge branch 'f15' of ssh://pkgs.fedoraproject.org/kernel into f15
    
    Conflicts:
    	kernel.spec

 acpi-ensure-thermal-limits-match-cpu-freq.patch |  128 +++++++++++++++++++++++
 kernel.spec                                     |    5 +
 2 files changed, 133 insertions(+), 0 deletions(-)
---
diff --cc kernel.spec
index a4d9e5f,8576869..c1a0e15
--- a/kernel.spec
+++ b/kernel.spec
@@@ -1855,9 -1851,9 +1857,12 @@@ f
  # and build.
  
  %changelog
 +* Tue Aug 30 2011 Chuck Ebbert <cebbert at redhat.com> 2.6.40.4-4
 +- Fix unsafe pointer access in sendmsg/sendmmsg
 +
+ * Tue Aug 30 2011 Josh Boyer <jwboyer at redhat.com>
+ - Add patch to fix rhbz 606017
+ 
  * Mon Aug 29 2011 Chuck Ebbert <cebbert at redhat.com> 2.6.40.4-3
  - Linux 3.0.4