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

[Justin M. Forbes]

commit b52c1627fff0b4eef2bf3ca1596533f54097535c
Merge: a5904b1 bf487c0
Author: Justin M. Forbes <jforbes at redhat.com>
Date:   Tue Mar 20 10:49:40 2012 -0500

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

 kernel.spec                                        |   10 +++++
 ...sible-tid_rx-reorder_timer-use-after-free.patch |   42 ++++++++++++++++++++
 2 files changed, 52 insertions(+), 0 deletions(-)
---
diff --cc kernel.spec
index e28ce92,b8014c1..a14c6fc
--- a/kernel.spec
+++ b/kernel.spec
@@@ -1996,13 -1996,10 +2002,17 @@@ f
  # and build.
  
  %changelog
 +* Tue Mar 20 2012 Justin M. Forbes <jforbes at redhat.com> 2.6.42.12-1
 +- Linux 3.2.10
 +- CVE-2012-1568 SHLIB_BASE randomization (rhbz 804947)
 +
 +* Mon Mar 19 2012 Steve Dickson <steved at redhat.com>
 +- NFSv4: Save the owner/group name string when doing open (bz 794780)
 +
+ * Tue Mar 20 2012 Josh Boyer <jwboyer at redhat.com>
+ - mac80211: fix possible tid_rx->reorder_timer use after free
+   from Stanislaw Gruska (rhbz 804007)
+ 
  * Fri Mar 16 2012 Justin M. Forbes <jforbes at redhat.com>
  - re-enable threading on hibernate compression/decompression