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

[Peter Robinson]

commit 2cf9926874eb8af38feb516a6175ecb7daee54c0
Merge: a40ef16 f87521d
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Mon Oct 22 21:23:50 2012 +0100

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

 ...all-cifs_lookup-on-hashed-negative-dentry.patch |   21 ++++++++++++++++++++
 kernel.spec                                        |    7 ++++++
 2 files changed, 28 insertions(+), 0 deletions(-)
---
diff --cc kernel.spec
index a5c8cd4,959f402..6f77317
--- a/kernel.spec
+++ b/kernel.spec
@@@ -2354,10 -2360,8 +2360,11 @@@ f
  #                 ||----w |
  #                 ||     ||
  %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)
  - CVE-2012-0957: uts: stack memory leak in UNAME26 (rhbz 862877 864824)
  - Fix rt2x00 usb reset resume (rhbz 856863)