Takashi Iwai ddf83485d7 Merge branch 'for-linus' into for-next ...

Conflicts:
	sound/pci/hda/hda_codec.c

Signed-off-by: Takashi Iwai <tiwai@suse.de>

2012-08-20 22:14:26 +02:00

105 KiB

Raw Blame History

View Raw