From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Mon, 4 Jul 2016 15:15:03 +0000 (-0700)
Subject: Merge 4.7-rc6 into staging-next
X-Git-Tag: Ubuntu-4.10.0-19.21~2991^2~1
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=7813029a509c0c92a5b16d846defaa50a2d3d7f1;p=mirror_ubuntu-artful-kernel.git

Merge 4.7-rc6 into staging-next

We want the staging fixes in here as well.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

7813029a509c0c92a5b16d846defaa50a2d3d7f1