diff options
| author | Takashi Iwai <tiwai@suse.de> | 2008-11-25 11:56:25 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2008-11-25 11:56:25 +0100 |
| commit | 0e19e7d2bff0ec04fe4dc920c580d8a321afa07f (patch) | |
| tree | 9e784e7556a92172a0b27465e0b081437e44335e /kernel/pm_qos_params.c | |
| parent | 82894b6f6f109722070d4d78730fe50cdaba9443 (diff) | |
| parent | f73d35853e9263c7c404f0d6c0fe3d83fc6fd5c0 (diff) | |
| download | op-kernel-dev-0e19e7d2bff0ec04fe4dc920c580d8a321afa07f.zip op-kernel-dev-0e19e7d2bff0ec04fe4dc920c580d8a321afa07f.tar.gz | |
Merge branch 'topic/fix/hda' into topic/hda
Conflicts:
sound/pci/hda/patch_sigmatel.c
Diffstat (limited to 'kernel/pm_qos_params.c')
0 files changed, 0 insertions, 0 deletions
