git.stricted.de - GitHub/moto-9609/android_kernel_motorola

author	Trond Myklebust <Trond.Myklebust@netapp.com>
	Tue, 23 Apr 2013 19:52:14 +0000 (15:52 -0400)
committer	Trond Myklebust <Trond.Myklebust@netapp.com>
	Tue, 23 Apr 2013 19:52:14 +0000 (15:52 -0400)
commit	b0212b84fb19cf89305ab96c73abdf3a76d05ef8
tree	429daec3f580ad8f4c39e90f212d259b19ba9394	tree \| snapshot (tar.gz zip)
parent	bd1d421abcaae1b84ba377ea4c33bba31d654199	commit \| diff
parent	eb04e0ac198cec3bab407ad220438dfa65c19c67	commit \| diff

Merge branch 'bugfixes' into linux-next

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