From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Mon, 8 Jun 2015 17:49:28 +0000 (-0700)
Subject: Merge 4.1-rc7 into tty-next
X-Git-Tag: omap-for-v4.2/wakeirq-drivers-v2^2~2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=00fda1682efdbd62a20a8a21aee52d994c323c7f;p=pandora-kernel.git

Merge 4.1-rc7 into tty-next

This fixes up a merge issue with the amba-pl011.c driver, and we want
the fixes in this branch as well.

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

00fda1682efdbd62a20a8a21aee52d994c323c7f
Reading git-diff-tree failed