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

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

diff --cc include/linux/hid.h
Simple merge

diff --cc include/net/bluetooth/hci.h
Simple merge

diff --cc mm/vmscan.c
Simple merge

diff --cc net/bluetooth/hci_event.c
index 1cd90753d1cbd3acfd64703bc68bbbace8d737a5,dcaa6dbbab2cfc505d069f1dc416cac94ff89117..49d5c941c9c7efcca1cb24c6a477fcd9d27ceb86
mode 100755,100644..100755
--- 1/net/bluetooth/hci_event.c
--- 2/net/bluetooth/hci_event.c
+++ b/net/bluetooth/hci_event.c

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

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