Merge tag 'v3.15' into bfq-3.15

Linux 3.15
bfq-3.15: merge official BFQv7r4 for Linux 3.15
Merge branch 'bfq-3.15' into pf-3.15