| commit | 5d5a8d2d9d6cca979efe4fe1552d787fdc542603 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Sun Nov 06 17:28:44 2011 -0800 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Sun Nov 06 17:28:44 2011 -0800 |
| tree | 716fdea6cb946cbb279de99bf24b2c2bb126d625 | |
| parent | d4a2e61f0b7a7b5b9e321e776a1e874c02e847e4 [diff] | |
| parent | 0c6d4b4e22a513f8563a2e00c5ab08e9f8796272 [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/super.c: quiet sparse noise ceph/mds_client.c: quiet sparse noise ceph: use new D_COMPLETE dentry flag ceph: clear parent D_COMPLETE flag when on dentry prune