Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
authorMark Brown <broonie@linaro.org>
Sun, 8 Dec 2013 21:51:36 +0000 (21:51 +0000)
committerMark Brown <broonie@linaro.org>
Sun, 8 Dec 2013 21:51:36 +0000 (21:51 +0000)
commit3ba8f67bac8f610b5148b93280387d3dccf7d0dd
tree6a17c20128c75787aad74ca2e98c128bd4ed8e55
parenta8eb5f1e4b10d8b7992ed0e6c0915687339201c3
parent925b33756551cb5304774d2e2b39e26e82308a68
Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
drivers/mmc/card/block.c
drivers/net/tun.c
mm/mprotect.c
net/bluetooth/af_bluetooth.c
net/bluetooth/sco.c
net/ipv4/tcp.c
net/unix/af_unix.c