tree d8d530703e39fcfd612934105d5e1b5fab94d85c
parent 5d908ab941e90291b5c31d990bdb8e87fa3f7146
parent c36b5b054aaf14d68261970e3769398110e636d8
author Takashi Iwai <tiwai@suse.de> 1346171219 -0700
committer Takashi Iwai <tiwai@suse.de> 1346171219 -0700

Merge branch 'for-linus' into for-next

Need to merge the fixes regarding EPSS.

Conflicts:
	sound/pci/hda/hda_codec.c