| commit | 5111711d3ed8f4f1012cac3ec3f2b463b549fbfd | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Tue Dec 14 11:09:05 2010 -0800 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Tue Dec 14 11:09:05 2010 -0800 |
| tree | dc44d88bc66d3e7ec4d1c9180d6d4289fe7c5901 | |
| parent | e13cf63f2bbd38721af557f0205da994ea068427 [diff] | |
| parent | c1ac3ffcd0bc7e9617f62be8c7043d53ab84deac [diff] |
Merge branch 'for-2.6.37' of git://linux-nfs.org/~bfields/linux * 'for-2.6.37' of git://linux-nfs.org/~bfields/linux: nfsd: Fix possible BUG_ON firing in set_change_info sunrpc: prevent use-after-free on clearing XPT_BUSY