diff options
author | Linus Torvalds | 2017-10-06 09:01:45 -0700 |
---|---|---|
committer | Linus Torvalds | 2017-10-06 09:01:45 -0700 |
commit | b77779b93d7a38d9a7f3462b83f6e6fadb6b9ce5 (patch) | |
tree | 4069743339aeca5a77a58eedb694621471af4683 /sound/arm/aaci.c | |
parent | 8d4ef4e15ec57eec5d24fb109fbc220eea9f0caf (diff) | |
parent | 38f340ccdf9ed5f1350505b46c5689d015967057 (diff) |
Merge tag 'ceph-for-4.14-rc4' of git://github.com/ceph/ceph-client
Pull ceph fixes from Ilya Dryomov:
"Two fixups for CephFS snapshot-handling patches in -rc1"
* tag 'ceph-for-4.14-rc4' of git://github.com/ceph/ceph-client:
ceph: fix __choose_mds() for LSSNAP request
ceph: properly queue cap snap for newly created snap realm
Diffstat (limited to 'sound/arm/aaci.c')
0 files changed, 0 insertions, 0 deletions