Takashi Iwai 49c4a4c524 Merge branch 'for-linus' into for-next
Conflicts:
	sound/pci/emu10k1/emu10k1_main.c

Signed-off-by: Takashi Iwai <tiwai@suse.de>
2015-04-29 07:28:29 +02:00
..
2011-03-31 11:26:23 -03:00
2012-12-07 07:20:55 +01:00