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

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

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

diff --cc mm/mmap.c
Simple merge

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

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