diff options
| author |   David S. Miller <davem@davemloft.net> | 2016-12-05 13:37:28 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-12-05 13:37:28 -0500 |
| commit | c3543688ab2f7d7e61e611f7025a4ee232df1051 (patch) | |
| tree | 84aa5de8e8281714e9e179316d4a7ca62a5618e4 /MAINTAINERS | |
| parent | Merge branch 'tcp-tsq-perf' (diff) | |
| parent | docs: ieee802154: update main documentation file (diff) | |
| download | linux-dev-c3543688ab2f7d7e61e611f7025a4ee232df1051.tar.xz linux-dev-c3543688ab2f7d7e61e611f7025a4ee232df1051.zip | |
Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next
Johan Hedberg says:
====================
pull request: bluetooth-next 2016-12-03
Here's a set of Bluetooth & 802.15.4 patches for net-next (i.e. 4.10
kernel):
- Fix for a potential NULL deref in the ieee802154 netlink code
- Fix for the ED values of the at86rf2xx driver
- Documentation updates to ieee802154
- Cleanups to u8 vs __u8 usage
- Timer API usage cleanups in HCI drivers
Please let me know if there are any issues pulling. Thanks.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index e773ad5446e3..c04f619c3532 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -6105,6 +6105,7 @@ F: drivers/idle/i7300_idle.c IEEE 802.15.4 SUBSYSTEM M: Alexander Aring <aar@pengutronix.de> +M: Stefan Schmidt <stefan@osg.samsung.com> L: linux-wpan@vger.kernel.org W: http://wpan.cakelab.org/ T: git git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth.git |