Merge branch 'fix/misc' into topic/misc
authorTakashi Iwai <tiwai@suse.de>
Wed, 17 Feb 2010 13:24:46 +0000 (14:24 +0100)
committerTakashi Iwai <tiwai@suse.de>
Wed, 17 Feb 2010 13:24:46 +0000 (14:24 +0100)
Conflicts:
sound/pci/hda/patch_realtek.c


Trivial merge