From: Takashi Iwai <tiwai@suse.de>
Date: Wed, 17 Feb 2010 13:24:46 +0000 (+0100)
Subject: Merge branch 'fix/misc' into topic/misc
X-Git-Tag: v2.6.34-rc1~3^2~5^2~9
X-Git-Url: http://ftp.safe.ca/?a=commitdiff_plain;h=7fb3a069bc5d3577409c2ae89f89cd264ff85816;p=safe%2Fjmp%2Flinux-2.6

Merge branch 'fix/misc' into topic/misc

Conflicts:
	sound/pci/hda/patch_realtek.c
---

7fb3a069bc5d3577409c2ae89f89cd264ff85816