diff options
| author |   Takashi Iwai <tiwai@suse.de> | 2015-12-23 08:33:34 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2015-12-23 08:33:34 +0100 |
| commit | 59c8231089be96165735585694a801ae58ec6c95 (patch) | |
| tree | 41bd60a9aec5df20e07a81fbb526c8bc05e997fc /include/linux/debugobjects.h | |
| parent | ALSA: oxfw: add stream format quirk for SCS.1 models (diff) | |
| parent | Merge tag 'asoc-fix-v4.4-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus (diff) | |
Merge branch 'for-linus' into for-next
Conflicts:
drivers/gpu/drm/i915/intel_pm.c
Diffstat (limited to 'include/linux/debugobjects.h')
0 files changed, 0 insertions, 0 deletions