| commit | 7928848997a708dcdf21e2d2f0875fe6764c5870 | [log] [tgz] |
|---|---|---|
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | Fri Apr 03 12:56:05 2015 +0200 |
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | Fri Apr 03 12:56:21 2015 +0200 |
| tree | 1c88c6d915fbade207fc0fbfda41af11ca5f758c | |
| parent | 7a3888a3ad15796c834dc6cb00d247d27021f01b [diff] | |
| parent | e416a893210a4b4f17bb7e6670f8cd218080a3d5 [diff] |
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>