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

diff --cc arch/arm/mm/mmu.c
Simple merge

diff --cc fs/fs-writeback.c
Simple merge

diff --cc kernel/exit.c
Simple merge

diff --cc kernel/sysctl.c
Simple merge

diff --cc mm/mlock.c
Simple merge

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