diff options
| author | 2010-01-19 15:53:43 +0100 | |
|---|---|---|
| committer | 2010-01-19 15:53:43 +0100 | |
| commit | 9e4c84967ef027fe50a03cf48dd6da9519c8e60c (patch) | |
| tree | 21d6b8168670f22521f3bb703e3b9d1932566c1c /tools/perf/scripts/python/netdev-times.py | |
| parent | ALSA: hda_intel: ALSA HD Audio patch for Intel Cougar Point DeviceIDs (diff) | |
| parent | ALSA: hda - Turn on EAPD only if available for Realtek codecs (diff) | |
Merge branch 'fix/hda' into topic/hda
Conflicts:
sound/pci/hda/patch_realtek.c
Diffstat (limited to 'tools/perf/scripts/python/netdev-times.py')
0 files changed, 0 insertions, 0 deletions
