tree 429daec3f580ad8f4c39e90f212d259b19ba9394
parent bd1d421abcaae1b84ba377ea4c33bba31d654199
parent eb04e0ac198cec3bab407ad220438dfa65c19c67
author Trond Myklebust <Trond.Myklebust@netapp.com> 1366746734 -0400
committer Trond Myklebust <Trond.Myklebust@netapp.com> 1366746734 -0400

Merge branch 'bugfixes' into linux-next

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