From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Tue, 7 Apr 2015 09:07:20 +0000 (+0200)
Subject: Merge 4.0-rc7 into tty-next
X-Git-Tag: omap-for-v4.1/fixes-rc1~74^2~6
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b3e3bf2ef2c74f5ce5c19510edbbb9bfc1d249c2;p=pandora-kernel.git

Merge 4.0-rc7 into tty-next

We want the fixes in here as well, also to help out with merge issues.

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

b3e3bf2ef2c74f5ce5c19510edbbb9bfc1d249c2
Reading git-diff-tree failed