projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 3a62b5f e6e2197)
Merge git://git.linux-nfs.org/pub/linux/nfs-2.6
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Thu, 3 Jan 2008 19:59:59 +0000 (11:59 -0800)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Thu, 3 Jan 2008 19:59:59 +0000 (11:59 -0800)
commit2c5d63d8f013f232fc6e353d9151b35ec7282d52
tree60dfd73e436b1420b4fc1e4b3c69d4b5e7a380d4tree | snapshot
parent3a62b5f3cdaa00413e25fa6d6b6816e2c67f92f6commit | diff
parente6e21970baff4845de74584e2efc8c964a55d574commit | diff
Merge git://git.linux-nfs.org/pub/linux/nfs-2.6

* git://git.linux-nfs.org/pub/linux/nfs-2.6:
  NFSv4: Fix open_to_lock_owner sequenceid allocation...
  NFSv4: nfs4_open_confirm must not set the open_owner as confirmed on error
  NFS: add newline to kernel warning message in auth_gss code
  NFSv4: Fix circular locking dependency in nfs4_kill_renewd
  NFS: Fix a possible Oops in fs/nfs/super.c
John Crispins staging tree