diff options
| author | Takashi Iwai <tiwai@suse.de> | 2012-03-02 09:00:33 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2012-03-02 09:00:33 +0100 |
| commit | 7c589750a70831b8cee3c10e01c297fefde104e3 (patch) | |
| tree | 871da898d9953dd50c4830400ba1dd0b614ee311 /net/atm/Makefile | |
| parent | 07cafff288266c3aa082f4bda3d47989e73ee85d (diff) | |
| parent | e49a3434f1bc64dc49ff3a56e416bb5894868dde (diff) | |
Merge branch 'fix/hda' into topic/hda
Speaker-Out renames are merged.
Conflicts:
sound/pci/hda/patch_realtek.c
Diffstat (limited to 'net/atm/Makefile')
0 files changed, 0 insertions, 0 deletions