Merge branch 'topic/beep-rename' into topic/hda
authorTakashi Iwai <tiwai@suse.de>
Mon, 16 Nov 2009 10:33:41 +0000 (11:33 +0100)
committerTakashi Iwai <tiwai@suse.de>
Mon, 16 Nov 2009 10:33:41 +0000 (11:33 +0100)
commitfe705ab1526bc2c8b7756f3a855f040ab2060af2
treec4444d19983c5578f9ef2bddc1fa01b6e42f91a3
parent7d1794e81b5f202c73d7e3e65f0ee7aae4928038
parentad1cd745060ae2f24026b3b3d09da3426df6ab36
Merge branch 'topic/beep-rename' into topic/hda
sound/pci/hda/patch_realtek.c
sound/pci/hda/patch_sigmatel.c