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

diff --cc drivers/usb/gadget/f_fs.c
Simple merge

diff --cc kernel/trace/trace.c
Simple merge

diff --cc mm/mempolicy.c
Simple merge

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

diff --cc net/bluetooth/hci_event.c
index eb41886fd9f4b3f6ec18ccde1aaeaf9ae480a894,5daf7ab26710b06336abf853bb5e8a1c51b5cc7f..1526fb232b3f16dc4146d198248a91bc335a7572
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/bluetooth/mgmt.c
Simple merge