From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 28 Jan 2011 02:12:58 +0000 (+1000)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph... 
X-Git-Tag: Ubuntu-5.0.0-8.9~20187
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=b12ece7d852efbc8db45371c068900fcc62002d4;p=mirror_ubuntu-disco-kernel.git

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: avoid picking MDS that is not active
  ceph: avoid immediate cap check after import
  ceph: fix flushing of caps vs cap import
  ceph: fix erroneous cap flush to non-auth mds
  ceph: fix cap_wanted_delay_{min,max} mount option initialization
  ceph: fix xattr rbtree search
  ceph: fix getattr on directory when using norbytes
---

b12ece7d852efbc8db45371c068900fcc62002d4