From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Tue, 24 Dec 2013 18:06:37 +0000 (-0800)
Subject: Merge 3.13-rc5 into staging-next
X-Git-Tag: v3.14-rc1~150^2~164
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=912cbd495204ee6fcb67b8704ffbda10615d1f2f;p=pandora-kernel.git

Merge 3.13-rc5 into staging-next

This resolves a merge issue with drivers/staging/imx-drm/imx-drm-core.c

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

912cbd495204ee6fcb67b8704ffbda10615d1f2f
Reading git-diff-tree failed