]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 25 Jan 2013 03:15:43 +0000 (19:15 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 25 Jan 2013 03:15:43 +0000 (19:15 -0800)
Pull cifs fixes from Steve French:
 "Two small cifs fixes"

* 'for-next' of git://git.samba.org/sfrench/cifs-2.6:
  fs/cifs/cifs_dfs_ref.c: fix potential memory leakage
  cifs: fix srcip_matches() for ipv6


Trivial merge