| commit | caf382fe31b7327a1e4449f1c05c0cc7fb5b90be | [log] [tgz] |
|---|---|---|
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | Sun Sep 14 19:33:47 2014 -0700 |
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | Sun Sep 14 19:33:47 2014 -0700 |
| tree | b7b0fcbf594db884a68cbc354ed933b5c8ad6d61 | |
| parent | ea521dbc48c1550a4302c851a1e77f5b84ac8f81 [diff] | |
| parent | 9e82bf014195d6f0054982c463575cdce24292be [diff] |
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>