tree e98cdb2860f6ac4e4bb6b2e233a1032eb18d08bb
parent 8c9a9dd0fa3a269d380eaae2dc1bee39e865fae1
parent ad661334b8ae421154b121ee6ad3b56807adbf11
author Linus Torvalds <torvalds@linux-foundation.org> 1218823355 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1218823355 -0700

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] mount of IPC$ breaks with iget patch
  [CIFS] remove trailing whitespace
  [CIFS] if get root inode fails during mount, cleanup tree connection