Merge tag 'v3.19-rc4' into next

Merge with mainline to bring in the latest thermal and other changes.
This commit is contained in:
Dmitry Torokhov
2015-01-15 09:46:14 -08:00
15497 changed files with 878449 additions and 621464 deletions

View File

@@ -460,7 +460,7 @@ static int evdev_open(struct inode *inode, struct file *file)
err_free_client:
evdev_detach_client(evdev, client);
kfree(client);
kvfree(client);
return error;
}