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

author Alex Shi <alex.shi@linaro.org>

Mon, 9 Jun 2014 04:57:26 +0000 (12:57 +0800)

committer Alex Shi <alex.shi@linaro.org>

Mon, 9 Jun 2014 04:57:26 +0000 (12:57 +0800)
author Alex Shi <alex.shi@linaro.org>
Mon, 9 Jun 2014 04:57:26 +0000 (12:57 +0800)
committer Alex Shi <alex.shi@linaro.org>
Mon, 9 Jun 2014 04:57:26 +0000 (12:57 +0800)
diff --cc kernel/futex.c
Simple merge
diff --cc kernel/hrtimer.c
Simple merge
diff --cc net/bluetooth/hci_conn.c
Simple merge
diff --cc net/bluetooth/hci_event.c

index cb6e369255359ebc7a22a0b5a8dd3d35da1475ab,ab2ec7c414cb213fd75c902d35e6c0bbbac9a683..eb41886fd9f4b3f6ec18ccde1aaeaf9ae480a894

mode 100755,100644..100755
--- 1/net/bluetooth/hci_event.c
--- 2/net/bluetooth/hci_event.c
+++ b/net/bluetooth/hci_event.c
author	Alex Shi <alex.shi@linaro.org>
	Mon, 9 Jun 2014 04:57:26 +0000 (12:57 +0800)
committer	Alex Shi <alex.shi@linaro.org>
	Mon, 9 Jun 2014 04:57:26 +0000 (12:57 +0800)
		1	2
kernel/futex.c	patch \|	diff1 \|	diff2 \|	blob \| history
kernel/hrtimer.c	patch \|	diff1 \|	diff2 \|	blob \| history
net/bluetooth/hci_conn.c	patch \|	diff1 \|	diff2 \|	blob \| history
net/bluetooth/hci_event.c	patch \|	diff1 \|	diff2 \|	blob \| history