caf382fe31
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> |
||
---|---|---|
.. | ||
bindings | ||
00-INDEX | ||
booting-without-of.txt | ||
changesets.txt | ||
todo.txt | ||
usage-model.txt |