Merge branch 'cifs-3.2' of git://git.samba.org/jlayton/linux into temp-3.2-jeff
authorSteve French <smfrench@gmail.com>
Thu, 20 Oct 2011 02:22:41 +0000 (21:22 -0500)
committerSteve French <smfrench@gmail.com>
Thu, 20 Oct 2011 02:22:41 +0000 (21:22 -0500)

Trivial merge