| commit | aa2b1cf5ca44811ab842c1cd8d32f95b8f51e557 | |
| author | Linus Torvalds <torvalds@linux-foundation.org> | |
| Mon, 15 Aug 2011 15:36:30 +0000 (15 08:36 -0700) | ||
| committer | Linus Torvalds <torvalds@linux-foundation.org> | |
| Mon, 15 Aug 2011 15:36:30 +0000 (15 08:36 -0700) | ||
| tree | 751ef6ea7dc70317260e95ac0d5bdf795418e12e | treesnapshot (tar.gz zip) |
| parent | 259a53407d9ae0c109902669c6f2f88a389dd163 | commitdiff |
| parent | e22906c564c2f9c73ee4621ef3b93fe374539f00 | commitdiff |
Merge git://git./linux/kernel/git/sfrench/cifs-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6:
cifs: Do not set cifs/ntfs acl using a file handle (try #4)
[CIFS] Cleanup use of CONFIG_CIFS_STATS2 ifdef to make transport routines more readable
* git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6:
cifs: Do not set cifs/ntfs acl using a file handle (try #4)
[CIFS] Cleanup use of CONFIG_CIFS_STATS2 ifdef to make transport routines more readable