tree 143956f878290e85de7c9130f465e862f587ee53
parent 301933a0acfdec837fd8b4884093b3f0fff01d8a
parent 4bf259e3ae5015e73282ba66716c4a917e1264ac
author Trond Myklebust <Trond.Myklebust@netapp.com> 1245287580 -0700
committer Trond Myklebust <Trond.Myklebust@netapp.com> 1245374024 -0700

Merge branch 'devel-for-2.6.31' into for-2.6.31

Conflicts:
	fs/nfs/client.c
	fs/nfs/super.c