diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-22 17:54:15 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-22 17:54:15 +0100 |
| commit | e25ba0ce039d1c5cae0b0057e4b9e228dc6744bd (patch) | |
| tree | 3f5d705161f24c6a9dc36c1947ce7f81e53db41b /drivers/mtd/devices/sst25l.c | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mas... (diff) | |
| parent | NFS: Revert pnfs ugliness from the generic NFS read code path (diff) | |
| download | linux-e25ba0ce039d1c5cae0b0057e4b9e228dc6744bd.tar.xz linux-e25ba0ce039d1c5cae0b0057e4b9e228dc6744bd.zip | |
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)
Diffstat (limited to 'drivers/mtd/devices/sst25l.c')
0 files changed, 0 insertions, 0 deletions