diff options
| author | David S. Miller <davem@davemloft.net> | 2015-03-31 19:45:58 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-03-31 19:45:58 +0300 |
| commit | 89a3f3c55ba54e08968b12a5f8e7d1787a0bbb4a (patch) | |
| tree | d5f5308662279892195231e2313f9d47dc1bb4f5 /net/ipv4/fib_frontend.c | |
| parent | 32eaf120e66b1763626ed564adf1e42e69da82f4 (diff) | |
| parent | a7a484bfca218f9671a3e3bc98851eab6b628310 (diff) | |
| download | linux-89a3f3c55ba54e08968b12a5f8e7d1787a0bbb4a.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-03-27
Here's another set of Bluetooth & 802.15.4 patches for 4.1:
- New API to control LE advertising data (i.e. peripheral role)
- mac802154 & at86rf230 cleanups
- Support for toggling quirks from debugfs (useful for testing)
- Memory leak fix for LE scanning
- Extra version info reading support for Broadcom controllers
Please let me know if there are any issues pulling. Thanks.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/fib_frontend.c')
0 files changed, 0 insertions, 0 deletions