summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2012-03-02 09:00:33 +0100
committerTakashi Iwai <tiwai@suse.de>2012-03-02 09:00:33 +0100
commit7c589750a70831b8cee3c10e01c297fefde104e3 (patch)
tree871da898d9953dd50c4830400ba1dd0b614ee311 /net
parent07cafff288266c3aa082f4bda3d47989e73ee85d (diff)
parente49a3434f1bc64dc49ff3a56e416bb5894868dde (diff)
Merge branch 'fix/hda' into topic/hda
Speaker-Out renames are merged. Conflicts: sound/pci/hda/patch_realtek.c
Diffstat (limited to 'net')
0 files changed, 0 insertions, 0 deletions