]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'bugfixes' into linux-next
authorTrond Myklebust <Trond.Myklebust@netapp.com>
Tue, 23 Apr 2013 19:52:14 +0000 (15:52 -0400)
committerTrond Myklebust <Trond.Myklebust@netapp.com>
Tue, 23 Apr 2013 19:52:14 +0000 (15:52 -0400)
commit54251384c37660a525338aa9073895da42971217
tree429daec3f580ad8f4c39e90f212d259b19ba9394
parent04dd1f857016a503d6cb9197bb18faa5c09ec5ba
parente734ae34318293d1f247c68eb5bc8c9d41222278
Merge branch 'bugfixes' into linux-next

Fix up a conflict between the linux-next branch and mainline.
Conflicts:
fs/nfs/nfs4proc.c
fs/nfs/nfs4client.c
fs/nfs/nfs4proc.c
fs/nfs/nfs4state.c
net/sunrpc/clnt.c