projects / cascardo / linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 38971ce 1cd275f)
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)
commite97b71ded9ebe527681961c9e6f5ba99f6711974
treea724e6f951456f1d855b55e3f34e3710b37f9f9atree | snapshot
parent38971ce2fac484249d697fe48a9b0851a0b62572commit | diff
parent1cd275f609ba46c8cae3ee77e499c54a0d13a983commit | diff
Merge branch 'for-linus' of git://git./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
Unnamed repository; edit this file 'description' to name the repository.