From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Mon, 9 Mar 2015 06:08:37 +0000 (+0100)
Subject: Merge 4.0-rc3 into tty-testing
X-Git-Tag: omap-for-v4.1/fixes-rc1~74^2~77
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=becba85f0e1ca8ab97bd7e836a7129a94ace1ff2;p=pandora-kernel.git

Merge 4.0-rc3 into tty-testing

This resolves a merge issue in drivers/tty/serial/8250/8250_pci.c

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

becba85f0e1ca8ab97bd7e836a7129a94ace1ff2
Reading git-diff-tree failed