diff options
author | Jiri Kosina <jkosina@suse.cz> | 2014-04-01 19:05:30 +0200 |
---|---|---|
committer | Jiri Kosina <jkosina@suse.cz> | 2014-04-01 19:05:30 +0200 |
commit | ded75664d1a7d74c1976da0969ddb31ad9839d4c (patch) | |
tree | 9a33e95fae5518df8a60231066ffa1b115853921 /include/sound/emu10k1_synth.h | |
parent | ad295b6d5739ab24880a31be403bbc8fab62e177 (diff) | |
parent | ca2ed12f163bf430a425ec725ef76df5254b9f45 (diff) | |
download | linux-ded75664d1a7d74c1976da0969ddb31ad9839d4c.tar.bz2 |
Merge branch 'for-3.15/hid-sensor-hub' into for-linus
Diffstat (limited to 'include/sound/emu10k1_synth.h')
0 files changed, 0 insertions, 0 deletions