From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Sat, 25 Jun 2016 14:29:44 +0000 (-0700)
Subject: Merge 4.7-rc4 into char-misc-next
X-Git-Tag: v4.8-rc1~194^2~13
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=194c8581eb9b6d42e9232c7693d86d2ee3799986;p=linux.git

Merge 4.7-rc4 into char-misc-next

We want those fixes in here to help with merge issues.

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

194c8581eb9b6d42e9232c7693d86d2ee3799986