mirror of
https://github.com/ukui/kernel.git
synced 2026-03-09 10:07:04 -07: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>