From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Tue, 4 Mar 2008 16:00:34 +0000 (-0800)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6
X-Git-Tag: v2.6.25-rc4~105
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a6c0e1f71d37b89c883d636eca48a017c055c8c4;p=linux-2.6

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] remove unused variable
  [CIFS] consolidate duplicate code in posix/unix inode handling
  [CIFS] fix build break when proc disabled
  [CIFS] factoring out common code in get_inode_info functions
  [CIFS] fix prepath conversion when server supports posix paths
  [CIFS] Only convert / when server does not support posix paths
  [CIFS] Fix mixed case name in structure dfs_info3_param
  [CIFS] fixup prefixpaths which contain multiple path components
  [CIFS] fix typo
  [CIFS] patch to fix incorrect encoding of number of aces on set mode
  [CIFS] Fix typo in quota operations
  [CIFS] clean up some hard to read ifdefs
  [CIFS] reduce checkpatch warnings
  [CIFS] fix warning in cifs_spnego.c
---

a6c0e1f71d37b89c883d636eca48a017c055c8c4