From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 22 Dec 2012 01:09:07 +0000 (-0800)
Subject: Merge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.6
X-Git-Tag: v3.8-rc1~2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=769cb858c23ba7379ea27208624b444cd7b61af2;p=profile%2Fivi%2Fkernel-x86-ivi.git

Merge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.6

Pull CIFS fixes from Steve French:
 "Misc small cifs fixes"

* 'for-next' of git://git.samba.org/sfrench/cifs-2.6:
  cifs: eliminate cifsERROR variable
  cifs: don't compare uniqueids in cifs_prime_dcache unless server inode numbers are in use
  cifs: fix double-free of "string" in cifs_parse_mount_options
---

769cb858c23ba7379ea27208624b444cd7b61af2