Merge branch 'for-linus' into for-next

Browse source

Conflicts:
	drivers/gpu/drm/i915/intel_pm.c

...

This commit is contained in:

Takashi Iwai 2015-12-23 08:33:34 +01:00

parent de5126cc3c 0fb0b822d1

commit 59c8231089

522 changed files with 4109 additions and 2539 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/uapi/linux/Kbuild

View file

2

include/uapi/linux/openvswitch.h

View file

7

include/uapi/linux/vfio.h

View file