From: Greg Kroah-Hartman 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: v4.1-rc1~152^2~138 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=7928848997a708dcdf21e2d2f0875fe6764c5870;p=users%2Fjedix%2Flinux-maple.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 --- 7928848997a708dcdf21e2d2f0875fe6764c5870