Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
authorMark Brown <broonie@kernel.org>
Thu, 18 Sep 2014 17:49:35 +0000 (10:49 -0700)
committerMark Brown <broonie@kernel.org>
Thu, 18 Sep 2014 17:49:35 +0000 (10:49 -0700)
commite2ddb358af5685e7a1de5400c80e4897554880d2
tree1aebc26eb1732593acccdcf91bb6b9cb28309be0
parentc751b693efbb57d1c79645c0d6e01c5ef3985e87
parentd831fd1b46d04e5c8c8a0431c321578d25852695
Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
arch/mips/kernel/scall32-o32.S
arch/mips/kernel/scall64-64.S
arch/mips/kernel/scall64-n32.S
arch/mips/kernel/scall64-o32.S
net/bluetooth/rfcomm/core.c
net/bluetooth/sco.c
security/commoncap.c