Merge branch 'testing' of github.com:ceph/ceph-client into v3.8-rc5-testing
authorAlex Elder <elder@inktank.com>
Wed, 30 Jan 2013 13:54:34 +0000 (07:54 -0600)
committerAlex Elder <elder@inktank.com>
Wed, 30 Jan 2013 13:54:34 +0000 (07:54 -0600)
commit969e5aa3b0162a02c4f287d48ff58ca2145acf1b
tree1af8e8e47e7352c6d3b4abfdb4aea6bd9458666f
parent949db153b6466c6f7cad5a427ecea94985927311
parent1ec3911dbd19076bcdfe5540096ff67f91a6ec02
Merge branch 'testing' of github.com:ceph/ceph-client into v3.8-rc5-testing
fs/ceph/file.c
include/linux/ceph/decode.h
include/linux/ceph/osdmap.h