Merge remote-tracking branch 'drivers-x86/linux-next'

Conflicts:
	drivers/platform/x86/apple-gmux.c
	drivers/platform/x86/compal-laptop.c
	drivers/platform/x86/fujitsu-tablet.c
	drivers/platform/x86/ideapad-laptop.c
	drivers/platform/x86/intel_oaktrail.c
	drivers/platform/x86/toshiba_acpi.c

diff --cc drivers/platform/x86/asus-laptop.c
Simple merge

diff --cc drivers/platform/x86/fujitsu-tablet.c
Simple merge

diff --cc drivers/platform/x86/ideapad-laptop.c
Simple merge

diff --cc drivers/platform/x86/sony-laptop.c
Simple merge

diff --cc drivers/platform/x86/thinkpad_acpi.c
Simple merge