diff options
| author |   Takashi Iwai <tiwai@suse.de> | 2012-04-07 12:26:55 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2012-04-07 12:26:55 +0200 |
| commit | 5ff5c3a4ab0d638fa63e939e75727c233b681e8d (patch) | |
| tree | a62c2f95c31130c74beef53910cf66023765f355 /mm/page_alloc.c | |
| parent | ALSA: hda - Fix internal mic for Lenovo Ideapad U300s (diff) | |
| parent | ALSA: hda - clean up CX20549 test mixer setup (diff) | |
| download | linux-dev-5ff5c3a4ab0d638fa63e939e75727c233b681e8d.tar.xz linux-dev-5ff5c3a4ab0d638fa63e939e75727c233b681e8d.zip | |
Merge branch 'fix/hda' into topic/hda
Conflicts:
sound/pci/hda/patch_conexant.c
Diffstat (limited to 'mm/page_alloc.c')
0 files changed, 0 insertions, 0 deletions