Merge branch 'for-linus' of git://ceph.newdream.net/git/ceph-client