Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android

Conflicts (add/add):
	drivers/input/evdev.c

diff --cc drivers/hid/hid-multitouch.c
Simple merge

diff --cc drivers/input/evdev.c
index 23425d7922ca0240f0527306a49e23540f99c9c9,c122dd2adc22bd16985cfea673132a4bff5b5c4c..f4897c8c15005ed943686e12ca3f022f24396933
--- 1/drivers/input/evdev.c
--- 2/drivers/input/evdev.c
+++ b/drivers/input/evdev.c
@@@ -297,9 -291,11 +299,13 @@@ static int evdev_release(struct inode *
        mutex_unlock(&evdev->mutex);
  
        evdev_detach_client(evdev, client);
-       kfree(client);
 +      if (client->use_wake_lock)
 +              wake_lock_destroy(&client->wake_lock);
+ 
+       if (is_vmalloc_addr(client))
+               vfree(client);
+       else
+               kfree(client);
  
        evdev_close_device(evdev);
  

diff --cc kernel/cgroup.c
Simple merge

diff --cc kernel/time/alarmtimer.c
Simple merge

diff --cc mm/mmap.c
Simple merge

diff --cc net/wireless/scan.c
Simple merge