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)
Need to merge the fixes regarding EPSS.

Conflicts:
sound/pci/hda/hda_codec.c


Trivial merge