diff options
| author | Takashi Iwai <tiwai@suse.de> | 2014-07-04 07:48:57 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2014-07-04 07:48:57 +0200 |
| commit | 1a0e3f9639ebe7f0f17b40eb96d03c05ec067979 (patch) | |
| tree | 55a007e8903e097cc1fee52dd17887b92d60c257 /sound/pci/emu10k1 | |
| parent | d5471e67229adb31a1e5f026955d006f06315f3d (diff) | |
| parent | e4d9e513dedb5ac4e166c1053314fa935ddecc8c (diff) | |
Merge branch 'for-linus' into for-next
Conflicts:
sound/pci/hda/hda_intel.c
Diffstat (limited to 'sound/pci/emu10k1')
0 files changed, 0 insertions, 0 deletions