From: Linus Torvalds Date: Tue, 22 Nov 2011 16:54:15 +0000 (-0800) Subject: Merge branch 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/linux-nfs X-Git-Tag: v3.2-rc3~13 X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=pandora-kernel.git;a=commitdiff_plain;h=e25ba0ce039d1c5cae0b0057e4b9e228dc6744bd Merge branch 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/linux-nfs * 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/linux-nfs: NFS: Revert pnfs ugliness from the generic NFS read code path SUNRPC: destroy freshly allocated transport in case of sockaddr init error NFS: Fix a regression in the referral code nfs: move nfs_file_operations declaration to bottom of file.c (try #2) nfs: when attempting to open a directory, fall back on normal lookup (try #5) --- e25ba0ce039d1c5cae0b0057e4b9e228dc6744bd