tree 8613cb904d0ba1756465e5949b52efd7f7ae02e0
parent 6ca813c4e515d9b868cd71703ef15f4af3aebb21
parent e2d2867ff8700d7431c68c089ff5f5ed7f2d5b40
author Linus Torvalds <torvalds@linux-foundation.org> 1217101532 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1217101532 -0700

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6

* 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6:
  When verifying the decoded header before decoding the object identifier
  [CIFS] Fix warnings from checkpatch
  [CIFS] Fix improper endian conversion of ACL subauth field
  [CIFS] Fix possible double free if search immediately after search rewind fails
  [CIFS] remove checkpatch warning
  Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
  cifs: assorted endian annotations
  [CIFS] break ATTR_SIZE changes out into their own function
  lockdep: annotate cifs in-kernel sockets
  [CIFS] Fix compiler warning on 64-bit