diff options
| author | Takashi Iwai <tiwai@suse.de> | 2018-12-10 11:26:53 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2018-12-10 11:26:53 +0100 |
| commit | 46079bacb469c2eff15802fcccc88b0bd56b1e6e (patch) | |
| tree | 52f3cc4768b5e63f3efc1979a50c1abee505c6dc /sound/firewire/Makefile | |
| parent | e854747d7593c03c03ee785a04dce9b301ae3a9a (diff) | |
| parent | 0bea4cc8383519f78f3f74caca7bdebdfb346d3b (diff) | |
Merge branch 'for-linus' into for-next
Back-merge for resolving the conflict of fixup entries added in both
branches.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/firewire/Makefile')
0 files changed, 0 insertions, 0 deletions