Merge tag 'v3.19-rc4' into next

Merge with mainline to bring in the latest thermal and other changes.

1 files changed, 1 insertions, 1 deletions

diff --git a/drivers/input/evdev.c b/drivers/input/evdev.c
index 8d4c6ca781ff..e7cee3880b75 100644
--- a/drivers/input/evdev.c
+++ b/drivers/input/evdev.c
@@ -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;
 }