summary refs log tree commit diff
path: root/kernel/Kconfig.locks
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2015-05-04 15:36:07 -0400
committerDavid S. Miller <davem@davemloft.net>2015-05-04 15:36:07 -0400
commit73e84313ee4178cac628009103a901af9dfe8920 (patch)
tree6328e1f97e4757dcf59d99e97eb2b70b352e62da /kernel/Kconfig.locks
parente2783717a71e9babfdd7c36c7e35b790d2c01022 (diff)
parent1add15646672ff4e7fe59bec2afcb5a0c80c5e49 (diff)
downloadlinux-73e84313ee4178cac628009103a901af9dfe8920.tar.gz
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-05-04

Here's the first bluetooth-next pull request for 4.2:

 - Various fixes for at86rf230 driver
 - ieee802154: trace events support for rdev->ops
 - HCI UART driver refactoring
 - New Realtek IDs added to btusb driver
 - Off-by-one fix for rtl8723b in btusb driver
 - Refactoring of btbcm driver for both UART & USB use

Please let me know if there are any issues pulling. Thanks.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'kernel/Kconfig.locks')
0 files changed, 0 insertions, 0 deletions