| commit | fc71ff8a6c187ecc1ba79ee5688668af97a970fc | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Sat Jul 31 02:02:21 2010 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Sat Jul 31 02:02:21 2010 |
| tree | 50fff02480afe0e7d233e62bb9f42965308d7ffc | |
| parent | 1cf66e16160653b4ac92e3ada57fc0bc48798145 [diff] | |
| parent | cfb506e1d330387dfaf334dd493b3773d388863d [diff] |
Merge branch 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6 * 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6: NFS: Ensure that writepage respects the nonblock flag NFS: kswapd must not block in nfs_release_page nfs: include space for the NUL in root path