Merge tag 'v3.14.6' into 3.14/master

This is the 3.14.6 stable release

Conflicts:
	Makefile
	drivers/acpi/acpica/tbutils.c
Merge branch '3.14/upstream-updates' into 3.14/master

Conflicts:
	Makefile
[PATCH] block: Switch from BFQ-v7r4 for 3.14.0 to BFQ-v7r5 for 3.14.0

. IMPROVEMENT: Improve throughput boosting by idling the device
  only for processes that, in addition to perform sequential I/O,
  are I/O-bound (apart from weight-raised queues, for which idling
  is always performed to guarantee them a low latency).
. IMPROVEMENT: Improve throughput boosting by depriving processes
  that cooperate often of weight-raising.
. CODE IMPROVEMENT: Pass of improvement of the readability of both
  comments and actual code.
Merge branch '3.14/bfq' into 3.14/master
Merge branch '3.14/upstream-updates' into 3.14/master

Conflicts:
	Makefile
Zen 3.14.x merged