From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Mon, 15 Sep 2014 02:33:47 +0000 (-0700)
Subject: Merge 3.17-rc5 into staging-next.
X-Git-Tag: fixes-for-v3.18-merge-window~15^2~438
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=caf382fe31b7327a1e4449f1c05c0cc7fb5b90be;p=pandora-kernel.git

Merge 3.17-rc5 into staging-next.

This fixes a merge conflict in lustre, and we want the other fixes that
went into 3.17-rc5 as well.

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

caf382fe31b7327a1e4449f1c05c0cc7fb5b90be
Reading git-diff-tree failed