Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
authorAlex Shi <alex.shi@linaro.org>
Thu, 16 Jan 2014 01:17:42 +0000 (09:17 +0800)
committerAlex Shi <alex.shi@linaro.org>
Thu, 16 Jan 2014 01:17:42 +0000 (09:17 +0800)
commit7bbbbe2e4bd1aa7c7b88a79e7fa1930c56fa8cf8
treeba6418d4c70efa59a8ff759f134271b2848dd56c
parent97a3f598db7ca886011296d9e364e20ab4d6e372
parentc8e95ac690b37fd1a469c685d716e24abae26992
Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
drivers/net/tun.c
kernel/sched/core.c
net/unix/af_unix.c