diff options
author | Takashi Iwai <tiwai@suse.de> | 2011-08-16 14:25:22 +0200 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2011-08-16 14:25:22 +0200 |
commit | 497979262f9e812be1d64e597ec1bbbf92c8eba3 (patch) | |
tree | 19f8279b10b577e78d4614bdd5d6338b4a778d34 /Documentation | |
parent | 082632e235ecc4cf189366967037ed832a8ee523 (diff) | |
parent | c503ad466da44ca23c658986629bf7a2e2eabbb7 (diff) | |
download | op-kernel-dev-497979262f9e812be1d64e597ec1bbbf92c8eba3.zip op-kernel-dev-497979262f9e812be1d64e597ec1bbbf92c8eba3.tar.gz |
Merge branch 'fix/hda' into topic/hda
Conflicts:
sound/pci/hda/alc268_quirks.c
Diffstat (limited to 'Documentation')
0 files changed, 0 insertions, 0 deletions