Merge branch 'for-linus' into for-next

Browse source

Need to merge the fixes regarding EPSS.

Conflicts:
	sound/pci/hda/hda_codec.c

...

This commit is contained in:

Takashi Iwai 2012-08-28 09:26:59 -07:00

parent 5d908ab941 c36b5b054a

commit a184d4e459

4 changed files with 10 additions and 3 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

2

sound/isa/als100.c

View file

6

sound/pci/hda/hda_codec.c

View file

1

sound/pci/hda/hda_codec.h

View file

4

sound/pci/hda/patch_sigmatel.c

View file