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

diff --cc arch/mips/kernel/scall32-o32.S
Simple merge

diff --cc arch/mips/kernel/scall64-64.S
Simple merge

diff --cc arch/mips/kernel/scall64-n32.S
Simple merge

diff --cc arch/mips/kernel/scall64-o32.S
Simple merge

diff --cc net/bluetooth/rfcomm/core.c
Simple merge

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

diff --cc security/commoncap.c
Simple merge