git.stricted.de - GitHub/LineageOS/G12/android_kernel_amlogic

author	J. Bruce Fields <bfields@redhat.com>
	Fri, 30 Aug 2013 20:42:49 +0000 (16:42 -0400)
committer	J. Bruce Fields <bfields@redhat.com>
	Fri, 30 Aug 2013 20:42:49 +0000 (16:42 -0400)
commit	b8297cec2da30d3a5869597dbd7c8280d46a7dba
tree	f9d59dec3cf856754e26a5a719630669366cb779	tree \| snapshot (tar.gz zip)
parent	2f74f972d4cc7d83408ea0c32d424edcb44887bf	commit \| diff
parent	d4e4ab86bcba5a72779c43dc1459f71fea3d89c8	commit \| diff

Merge tag 'v3.11-rc5' into for-3.12 branch

For testing purposes I want some nfs and nfsd bugfixes (specifically,
58cd57bfd9db3bc213bf9d6a10920f82095f0114 and previous nfsd patches, and
Trond's 4f3cc4809a98a165a9708b72b47de71643797bbd).