diff options
| author |   Takashi Iwai <tiwai@suse.de> | 2015-06-09 07:22:26 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2015-06-09 07:22:26 +0200 |
| commit | 8654844cf51d434dad5d4d9f48dc99d1ac89aad7 (patch) | |
| tree | ce1ad2eb865c6f5e15b4f7f119e05e439d675a53 /tools/perf/scripts/python/export-to-postgresql.py | |
| parent | ASoC: intel: Remove unused variable hsw (diff) | |
| parent | ALSA: hda - fix number of devices query on hotplug (diff) | |
| download | wireguard-linux-8654844cf51d434dad5d4d9f48dc99d1ac89aad7.tar.xz wireguard-linux-8654844cf51d434dad5d4d9f48dc99d1ac89aad7.zip | |
Merge branch 'for-linus' into for-next
Resolve the non-trivial conflict due to the hdac regmap API changes.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'tools/perf/scripts/python/export-to-postgresql.py')
0 files changed, 0 insertions, 0 deletions