Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 27 May 2011 21:07:44 +0000 (14:07 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 27 May 2011 21:07:44 +0000 (14:07 -0700)
* git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6:
  [CIFS] Follow on to cifsacl endian patch (__constant_cpu_to_le32 was required)


Trivial merge