diff options
| author | David S. Miller <davem@davemloft.net> | 2015-12-31 12:22:45 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-12-31 12:22:45 -0500 |
| commit | 7b22a7788b0263f42f7232c5c05c503424ffa0ba (patch) | |
| tree | e6460f2340320ad4194764183ca601e8371096cc /net/netfilter | |
| parent | ccac0425655918fccd0ffec47b2788cb1ac62d7b (diff) | |
| parent | 7ddb69222d0fdc0bc83b60dbb21d9864ebf2907e (diff) | |
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-12-31
Here's (probably) the last bluetooth-next pull request for the 4.5
kernel:
- Add support for BCM2E65 ACPI ID
- Minor fixes/cleanups in the bcm203x & bfusb drivers
- Minor debugfs related fix in 6lowpan code
Please let me know if there are any issues pulling. Thanks.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/netfilter')
0 files changed, 0 insertions, 0 deletions