Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
authorMark Brown <broonie@linaro.org>
Mon, 14 Jul 2014 09:46:05 +0000 (10:46 +0100)
committerMark Brown <broonie@linaro.org>
Mon, 14 Jul 2014 09:46:05 +0000 (10:46 +0100)
commite503fc621facb9f21bee519e94adbf0061d445f8
treea62b2920beb67cecd5057e760c32e0ccc586edda
parentc30d344580ad053502cf5d81288dcd690791d162
parentfa6e05294759c29b3736010aa386928d24715feb
Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
drivers/usb/gadget/f_fs.c
kernel/trace/trace.c
mm/mempolicy.c
net/bluetooth/hci_conn.c
net/bluetooth/hci_event.c
net/bluetooth/mgmt.c