diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-30 09:46:09 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-30 09:46:09 -0700 |
| commit | 50f3515828024582402044bcced6804c070c491c (patch) | |
| tree | f9cf25bee56d0ca54acf4d571536268774dc56ed /fs/nilfs2/nilfs.h | |
| parent | 6aba74f2791287ec407e0f92487a725a25908067 (diff) | |
| parent | 4b2a58abd1e17c0ee53c8dded879e015917cca67 (diff) | |
| download | op-kernel-dev-50f3515828024582402044bcced6804c070c491c.zip op-kernel-dev-50f3515828024582402044bcced6804c070c491c.tar.gz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client
* git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client:
libceph: Create a new key type "ceph".
libceph: Get secret from the kernel keys api when mounting with key=NAME.
ceph: Move secret key parsing earlier.
libceph: fix null dereference when unregistering linger requests
ceph: unlock on error in ceph_osdc_start_request()
ceph: fix possible NULL pointer dereference
ceph: flush msgr_wq during mds_client shutdown
Diffstat (limited to 'fs/nilfs2/nilfs.h')
0 files changed, 0 insertions, 0 deletions
