Merge branch 'linux-linaro-lsk-v3.10' into linux-linaro-lsk-v3.10-android

diff --cc drivers/usb/gadget/composite.c
Simple merge

diff --cc fs/debugfs/inode.c
Simple merge

diff --cc fs/exportfs/expfs.c
Simple merge

diff --cc fs/proc/task_mmu.c
Simple merge

diff --cc include/linux/cpu.h
Simple merge

diff --cc include/linux/kernel.h
Simple merge

diff --cc include/linux/mm.h
Simple merge

diff --cc kernel/cgroup.c
Simple merge

diff --cc kernel/cpu.c
Simple merge

diff --cc kernel/trace/trace.c
Simple merge

diff --cc net/ipv4/tcp_input.c
Simple merge

diff --cc net/ipv4/tcp_ipv4.c
Simple merge

diff --cc net/ipv4/tcp_output.c
Simple merge

diff --cc net/ipv6/tcp_ipv6.c
Simple merge