]> git.baikalelectronics.ru Git - kernel.git/commit
Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 15 Aug 2011 15:36:30 +0000 (08:36 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 15 Aug 2011 15:36:30 +0000 (08:36 -0700)
commit5f087d1fda321fa4a54578d4556b2cbf3facf48e
tree751ef6ea7dc70317260e95ac0d5bdf795418e12e
parent4a1073d6a852d032f34a2fb8ea2b32f3afcbc616
parent9d8a4690259159dc15227ab3cacefcdde9f02bc8
Merge git://git.kernel.org/pub/scm/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