]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: fff7ed8 7f46f20)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 14 Dec 2010 19:02:15 +0000 (11:02 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 14 Dec 2010 19:02:15 +0000 (11:02 -0800)
commit54f9dc25c8893a0cbdf685967f676cf12999c023
treea724e6f951456f1d855b55e3f34e3710b37f9f9atree | snapshot
parentfff7ed83988e1092fae6ae07727854fae9a7500fcommit | diff
parent7f46f20cf523f2d53545a168ccf77ef0bf3f8ee9commit | diff
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client:
  ceph: fix ioctl magic
  ceph: Behave better when handling file lock replies.
  ceph: pass lock information by struct file_lock instead of as individual params.
  ceph: Handle file locks in replies from the MDS.
  ceph: avoid possible null deref in readdir after dir llseek
Linux Kernel Source Tree.