tree 2c840949d6a7b538228ded831753d659bf8cd628
parent a044a1b147a1c967e1a4b797c3e24c395f3d878a
parent f534dc994397560343be4a3223b9bbaa8e739e1f
author Linus Torvalds <torvalds@linux-foundation.org> 1258478438 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1258478438 -0800

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: clear server inode number flag while autodisabling