Greg Kroah-Hartman caf382fe31 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>
2014-09-14 19:33:47 -07:00
..
2014-08-22 10:47:59 -04:00
2014-07-11 04:57:36 -07:00
2014-08-15 18:28:58 -06:00
2014-09-12 11:59:10 -07:00
2014-08-18 14:17:41 +02:00