Merge branch 'for-linus' into for-next
authorTakashi Iwai <tiwai@suse.de>
Tue, 28 Aug 2012 16:26:59 +0000 (09:26 -0700)
committerTakashi Iwai <tiwai@suse.de>
Tue, 28 Aug 2012 16:26:59 +0000 (09:26 -0700)
commita184d4e4591bb53fd8b91d6e8b85cffa261fb83e
treed8d530703e39fcfd612934105d5e1b5fab94d85c
parent5d908ab941e90291b5c31d990bdb8e87fa3f7146
parentc36b5b054aaf14d68261970e3769398110e636d8
Merge branch 'for-linus' into for-next

Need to merge the fixes regarding EPSS.

Conflicts:
sound/pci/hda/hda_codec.c
sound/pci/hda/hda_codec.c
sound/pci/hda/hda_codec.h
sound/pci/hda/patch_sigmatel.c