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)
commitb0212b84fb19cf89305ab96c73abdf3a76d05ef8
tree429daec3f580ad8f4c39e90f212d259b19ba9394
parentbd1d421abcaae1b84ba377ea4c33bba31d654199
parenteb04e0ac198cec3bab407ad220438dfa65c19c67
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