aboutsummaryrefslogtreecommitdiffstats
path: root/tools/perf/scripts/python
diff options
context:
space:
mode:
authorJohn W. Linville <linville@tuxdriver.com>2013-07-31 15:11:50 -0400
committerJohn W. Linville <linville@tuxdriver.com>2013-07-31 15:11:50 -0400
commit704278ccb5c9fcbe09d1be3657950c17fad18ba8 (patch)
tree1e15c5196541b928f076ae8d50e56a4cf9fbe7b8 /tools/perf/scripts/python
parentMAINTAINERS: change email of TI WiLink drivers' maintainer (diff)
parentBluetooth: Fix calling request callback more than once (diff)
downloadlinux-dev-704278ccb5c9fcbe09d1be3657950c17fad18ba8.tar.xz
linux-dev-704278ccb5c9fcbe09d1be3657950c17fad18ba8.zip
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth
Conflicts: net/bluetooth/hci_core.c
Diffstat (limited to 'tools/perf/scripts/python')
0 files changed, 0 insertions, 0 deletions