diff options
| author | Michael Ellerman <mpe@ellerman.id.au> | 2017-08-23 22:20:10 +1000 |
|---|---|---|
| committer | Michael Ellerman <mpe@ellerman.id.au> | 2017-08-23 22:20:10 +1000 |
| commit | 15c659ff9d5b367c886166a9854a89b72c524a68 (patch) | |
| tree | d33acaf62889bf6304f6109dd69923a17ab938be /sound/oss/midi_synth.c | |
| parent | 516fa8d0e19d854253460ea7692551e836e7e2b5 (diff) | |
| parent | 1a92a80ad386a1a6e3b36d576d52a1a456394b70 (diff) | |
Merge branch 'fixes' into next
There's a non-trivial dependency between some commits we want to put in
next and the KVM prefetch work around that went into fixes. So merge
fixes into next.
Diffstat (limited to 'sound/oss/midi_synth.c')
0 files changed, 0 insertions, 0 deletions