This catches the files I had to do by hand as Dmitry's patch differed from my tree.
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>