From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Mon, 18 May 2015 21:08:58 +0000 (-0700)
Subject: Merge 4.1-rc4 into tty-next
X-Git-Tag: omap-for-v4.2/wakeirq-drivers-v2^2~59
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=02730d3c053a9af1d402e1c8dc8bbbc5a1340406;p=pandora-kernel.git

Merge 4.1-rc4 into tty-next

This resolves some tty driver merge issues.

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

02730d3c053a9af1d402e1c8dc8bbbc5a1340406
Reading git-diff-tree failed