Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
authorMark Brown <broonie@linaro.org>
Mon, 14 Oct 2013 10:27:26 +0000 (11:27 +0100)
committerMark Brown <broonie@linaro.org>
Mon, 14 Oct 2013 10:27:26 +0000 (11:27 +0100)
commitacaf699b4e42227a3e4d23ab0d33af02fa3f4fa0
tree01249c2fc8843e84f2f94b5860292225e7f81878
parent6ea1971e5ce9bb8f07b3dc70e10be749526b802e
parent095857390c54551a081d0286d3a39c7c049d0d33
Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
drivers/net/tun.c
include/linux/hid.h
include/net/bluetooth/hci.h
mm/vmscan.c
net/bluetooth/hci_event.c
net/ipv4/af_inet.c
net/ipv4/tcp.c