Merge branch 'linux-linaro-lsk-v3.10' into linux-linaro-lsk-v3.10-android
authorAlex Shi <alex.shi@linaro.org>
Tue, 12 May 2015 07:18:24 +0000 (15:18 +0800)
committerAlex Shi <alex.shi@linaro.org>
Tue, 12 May 2015 07:18:24 +0000 (15:18 +0800)
commit54db03197e2d0aca252bc377938777b30d3e7f10
tree8f078dfe75c88e09ae8557f8b6aa288bbdaddc97
parent2075186d012c815911494f34fc16aef7c8f3492b
parent1f8fdf83fe376cc83e96e942689a6cfac01e9634
Merge branch 'linux-linaro-lsk-v3.10' into linux-linaro-lsk-v3.10-android
14 files changed:
drivers/usb/gadget/composite.c
fs/debugfs/inode.c
fs/exportfs/expfs.c
fs/proc/task_mmu.c
include/linux/cpu.h
include/linux/kernel.h
include/linux/mm.h
kernel/cgroup.c
kernel/cpu.c
kernel/trace/trace.c
net/ipv4/tcp_input.c
net/ipv4/tcp_ipv4.c
net/ipv4/tcp_output.c
net/ipv6/tcp_ipv6.c