]> pilppa.com Git - linux-2.6-omap-h63xx.git/commit
Merge branch 'topic/fix/hda' into topic/hda
authorTakashi Iwai <tiwai@suse.de>
Wed, 12 Nov 2008 09:02:04 +0000 (10:02 +0100)
committerTakashi Iwai <tiwai@suse.de>
Wed, 12 Nov 2008 09:02:04 +0000 (10:02 +0100)
commit90d0be2fc33b4c4e11fc596da4736189be947d99
tree0dd7e261f8d79d933c0a93c1a714b9a72fa05c28
parentf43aa025b7de79d6a615ea4c1e6be7e6b1cea538
parentd7a8943635485597ae7c6d554a8ccf3ce5a42d2d
Merge branch 'topic/fix/hda' into topic/hda

Conflicts:
sound/pci/hda/patch_sigmatel.c
sound/pci/hda/patch_analog.c
sound/pci/hda/patch_sigmatel.c