Signed-off-by: Alessandro Rubini <rubini@gnudd.com> Conflicts: kernel/fmc-core.c kernel/fmc-fakedev.c