]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'for-2.6.36' of git://linux-nfs.org/~bfields/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 28 Aug 2010 21:05:55 +0000 (14:05 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 28 Aug 2010 21:05:55 +0000 (14:05 -0700)
commite7380a8fcbd76d62f381bc960054ac769d2ae4f7
tree786404cb38c6ca55ca46a63df570c119ca32561e
parent685e0711814b7cc1aaf31c74a865167edaf8fd00
parent45b9b83d92e3363f74c45a2dab928e37e2cf64df
Merge branch 'for-2.6.36' of git://linux-nfs.org/~bfields/linux

* 'for-2.6.36' of git://linux-nfs.org/~bfields/linux:
  nfsd: fix NULL dereference in nfsd_statfs()
  nfsd4: fix downgrade/lock logic
  nfsd4: typo fix in find_any_file
  nfsd4: bad BUG() in preprocess_stateid_op