tree 7fe3ba3b95faeecb01e4feafb9288ef4b523c6b3
parent 291186e049d7f8178ad31d43c38a53889f25d79e
parent 9d3415a8cc76ff65c6602a121ac318432c5cd7ba
author Takashi Iwai <tiwai@suse.de> 1266413086 +0100
committer Takashi Iwai <tiwai@suse.de> 1266413086 +0100

Merge branch 'fix/misc' into topic/misc

Conflicts:
	sound/pci/hda/patch_realtek.c