]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
Merge branch 'fix/hda' into for-linus
authorTakashi Iwai <tiwai@suse.de>
Thu, 2 Dec 2010 16:14:50 +0000 (17:14 +0100)
committerTakashi Iwai <tiwai@suse.de>
Thu, 2 Dec 2010 16:14:50 +0000 (17:14 +0100)

Trivial merge