diff options
author | Chris Mason <clm@fb.com> | 2014-12-03 03:42:03 +0100 |
---|---|---|
committer | Chris Mason <clm@fb.com> | 2014-12-03 03:42:03 +0100 |
commit | 9627aeee3e203e30679549e4962633698a6bf87f (patch) | |
tree | 30ee313a7049bf3fcc17e346df5737e967fd9a95 /sound/oss/sb_mixer.c | |
parent | Btrfs: make get_caching_control unconditionally return the ctl (diff) | |
parent | Btrfs, replace: enable dev-replace for raid56 (diff) | |
download | linux-9627aeee3e203e30679549e4962633698a6bf87f.tar.xz linux-9627aeee3e203e30679549e4962633698a6bf87f.zip |
Merge branch 'raid56-scrub-replace' of git://github.com/miaoxie/linux-btrfs into for-linus
Diffstat (limited to 'sound/oss/sb_mixer.c')
0 files changed, 0 insertions, 0 deletions