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

[Peter Robinson]

commit b71c8a4360a962b6fdccd416baebb08a6295fcfd
Merge: ebea7f2 c8c2a31
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Mon Oct 22 21:24:49 2012 +0100

    Merge branch 'f17' of ssh://pkgs.fedoraproject.org/kernel into f17

 ...all-cifs_lookup-on-hashed-negative-dentry.patch |   21 ++++++++++++++++++++
 kernel.spec                                        |    9 ++++++++
 2 files changed, 30 insertions(+), 0 deletions(-)
---
diff --cc kernel.spec
index e8dbcf9,e8daa37..f2b987e
--- a/kernel.spec
+++ b/kernel.spec
@@@ -2334,10 -2340,10 +2340,13 @@@ f
  #    '-'      |  |
  #              '-'
  %changelog
 +* Mon Oct 22 2012 Peter Robinson <pbrobinson at fedoraproject.org>
 +- VIFO fails on ARM at the moment so disable it for the time being
 +
  * Mon Oct 22 2012 Josh Boyer <jwboyer at redhat.com>
+ - Add patch to fix CIFS oops from Jeff Layton (rhbz 867344)
+ 
+ * Mon Oct 22 2012 Josh Boyer <jwboyer at redhat.com> - 3.6.3-1
  - CVE-2012-0957: uts: stack memory leak in UNAME26 (rhbz 862877 864824)
  - Fix rt2x00 usb reset resume (rhbz 856863)
  - Linux v3.6.3