From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 14 Dec 2010 19:02:15 +0000 (-0800)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph... 
X-Git-Tag: upstream/snapshot3+hdmi~12286
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e97b71ded9ebe527681961c9e6f5ba99f6711974;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git

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
---

e97b71ded9ebe527681961c9e6f5ba99f6711974