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

diff --cc drivers/mmc/card/block.c
Simple merge

diff --cc drivers/net/tun.c
Simple merge

diff --cc mm/mprotect.c
Simple merge

diff --cc net/bluetooth/af_bluetooth.c
Simple merge

diff --cc net/bluetooth/sco.c
Simple merge

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

diff --cc net/unix/af_unix.c
Simple merge