summaryrefslogtreecommitdiff
path: root/include/linux/perf_event.h
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2015-09-22 02:00:44 +0300
committerDavid S. Miller <davem@davemloft.net>2015-09-22 02:00:44 +0300
commit5dcd2461073a43b2aa48ab5cfc135ba182667794 (patch)
treec5a526ea79c483d084a54df35103091b2d00bc93 /include/linux/perf_event.h
parenta1ef48e1e8843e2f6be631b8cf1c21b24579b9d6 (diff)
parent6818375e974aa8659c3d2b1bf4b660a2a7929077 (diff)
downloadlinux-5dcd2461073a43b2aa48ab5cfc135ba182667794.tar.xz
Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next
Johan Hedberg says: ==================== pull request: bluetooth-next 2015-09-18 Here's the first bluetooth-next pull request for the 4.4 kernel: - ieee802154 cleanups & fixes - debugfs support for the at86rf230 driver - Support for quirky (seemingly counterfeit) CSR Bluetooth controllers - Power management and device config improvements for Intel controllers - Fix for devices with incorrect advertising data length - Fix for closing HCI user channel socket Please let me know if there are any issues pulling. Thanks. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux/perf_event.h')
0 files changed, 0 insertions, 0 deletions