Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
authorMark Brown <broonie@linaro.org>
Thu, 5 Dec 2013 10:16:50 +0000 (10:16 +0000)
committerMark Brown <broonie@linaro.org>
Thu, 5 Dec 2013 10:16:50 +0000 (10:16 +0000)
commita8eb5f1e4b10d8b7992ed0e6c0915687339201c3
tree69dbf24ffe53feb88b2189d22f6092314daa8231
parent302774e6db8e9845bf065a781237a2bb808186bb
parentdffe2a3eed105c631500778dfaba0998d7bf8512
Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android

Conflicts (add/add):
drivers/input/evdev.c
drivers/hid/hid-multitouch.c
drivers/input/evdev.c
kernel/cgroup.c
kernel/time/alarmtimer.c
mm/mmap.c
net/wireless/scan.c