Merge branch 'for-linus' into for-next

Browse source

This merges and resolves the non-trivial conflicts with the recent fix
for hda-i915 binding fallback.

Conflicts:
	sound/pci/hda/hda_intel.c

Signed-off-by: Takashi Iwai <tiwai@suse.de>

...

This commit is contained in:

Takashi Iwai 2015-06-11 06:52:31 +02:00

parent 692af901df bf06848bdb

commit 4af88a9c1b

2 changed files with 5 additions and 1 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

3

sound/hda/hdac_regmap.c

View file

3

sound/pci/hda/hda_intel.c

View file