From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Fri, 3 Apr 2015 10:56:05 +0000 (+0200)
Subject: Merge lustre patches based on 4.0-rc5 into staging-testing
X-Git-Tag: omap-for-v4.1/fixes-rc1~165^2~138
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7928848997a708dcdf21e2d2f0875fe6764c5870;p=pandora-kernel.git

Merge lustre patches based on 4.0-rc5 into staging-testing

This is done to handle some lustre patches that were made against the
wrong kernel branch, which was my fault, as I gave a lecture where I
messed things up for the students, it wasn't their fault.

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

7928848997a708dcdf21e2d2f0875fe6764c5870
Reading git-diff-tree failed