Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
authorAlex Shi <alex.shi@linaro.org>
Mon, 9 Jun 2014 04:57:26 +0000 (12:57 +0800)
committerAlex Shi <alex.shi@linaro.org>
Mon, 9 Jun 2014 04:57:26 +0000 (12:57 +0800)
commit69284a3b89dbc6a8fccf5e571bb1279ddf226cfc
tree6e39013cbf0181bc84fdf8ff23458ddabfbb2447
parente3e443179f1cefb72e59ce6b923532d27be60757
parent3b8d7f4db34913c8e2ea0177723784b646f7424e
Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
kernel/futex.c
kernel/hrtimer.c
net/bluetooth/hci_conn.c
net/bluetooth/hci_event.c