Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 9 Nov 2009 17:50:15 +0000 (09:50 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 9 Nov 2009 17:50:15 +0000 (09:50 -0800)
* git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6:
  cifs: don't use CIFSGetSrvInodeNumber in is_path_accessible
  cifs: clean up handling when server doesn't consistently support inode numbers


Trivial merge