mirror of
https://github.com/torvalds/linux.git
synced 2026-01-25 15:03:52 +08:00
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>