]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commit
Merge branch 'for-linus' of git://git.samba.org/sfrench/cifs-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 10 Nov 2012 05:59:35 +0000 (06:59 +0100)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 10 Nov 2012 05:59:35 +0000 (06:59 +0100)
commitaffd9a8dbc22beadae1186aa060685d6f6a06792
tree38979f4809c5364420035a036b594fef2d7fc539
parent487bda54d776f2ff094b5498429c1a85da165723
parent3798f47aa276b332c30da499cb4df4577e2f8872
Merge branch 'for-linus' of git://git.samba.org/sfrench/cifs-2.6

Pull cifs fixes from Jeff Layton.

* 'for-linus' of git://git.samba.org/sfrench/cifs-2.6:
  cifs: Do not lookup hashed negative dentry in cifs_atomic_open
  cifs: fix potential buffer overrun in cifs.idmap handling code