Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 28 Aug 2010 21:05:15 +0000 (14:05 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 28 Aug 2010 21:05:15 +0000 (14:05 -0700)
commit7be0d4f90ad8e0f9591fd311765a212a42e26b13
treede0050139b877edea5e9372e13bbcb152daaf3b3
parent62b88dc1912c7d105f768e0e64756f8bd83936db
parentf0138a79d74e1e942970ea163be268cd2e4bbcfc
Merge git://git./linux/kernel/git/sfrench/cifs-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6:
  Cannot allocate memory error on mount
  [CIFS] Eliminate unused variable warning