From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Mon, 17 Mar 2014 18:27:39 +0000 (-0700)
Subject: Merge 3.14-rc7 into staging-next
X-Git-Tag: v3.15-rc1~139^2~325
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e40bffaeaed9c5a26c3e5c961c3dee72c1b46558;p=pandora-kernel.git

Merge 3.14-rc7 into staging-next

This resolves a merge issue with drivers/staging/cxt1e1/linux.c that was
fixed in a report from Stephen Rothwell

Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

e40bffaeaed9c5a26c3e5c961c3dee72c1b46558
Reading git-diff-tree failed