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>
This commit is contained in:
Greg Kroah-Hartman 2015-04-03 12:56:05 +02:00
commit 7928848997
809 changed files with 37237 additions and 20720 deletions

Some files were not shown because too many files have changed in this diff Show more