Merge branch 'for-linus' into for-next

Browse source

Conflicts:
	drivers/gpu/drm/i915/intel_display.c
	sound/soc/intel/skylake/skl.h

...

This commit is contained in:

Takashi Iwai 2016-01-06 20:58:13 +01:00

parent ca9ea7a5ff 3f37b26f8d

commit 9d9938854e

152 changed files with 1609 additions and 858 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

1

include/linux/blkdev.h

View file

1

include/linux/usb/cdc_ncm.h

View file

6

include/linux/vmstat.h

View file

2

include/sound/soc.h

View file