Linux 3.15.9

Signed-off-by: David Sterba <dsterba@suse.cz>
Fixup conflicts

Signed-off-by: David Sterba <dsterba@suse.cz>