Merge branch 'master' of git+ssh://git.samba.org/data/git/sfrench/cifs-2.6
authorSteve French <sfrench@us.ibm.com>
Wed, 18 Jan 2012 21:12:04 +0000 (15:12 -0600)
committerSteve French <sfrench@us.ibm.com>
Wed, 18 Jan 2012 21:12:04 +0000 (15:12 -0600)
commit34f598ca0803f399da3438df46c7f56bfe423789
treeafea2105e4f057722792a72db49aa21457ad65c8
parentdcd169b761d52e3f9122e30442b83863bdf1d9d9
parent789b4588da40cf572ef982bdc5d590ec1b0386fe
Merge branch 'master' of git+ssh://git.samba.org/data/git/sfrench/cifs-2.6