diff options
| author | David S. Miller <davem@davemloft.net> | 2014-12-18 15:32:27 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-12-18 15:32:27 -0500 |
| commit | 7dce675b28bcd7f9daf3eef896ec2757255e2623 (patch) | |
| tree | 9e3deab8024bdb8146e78a0578344f077f349bfa /net/mac80211 | |
| parent | ac9a3d84e121196263636f2d38d439a45888005a (diff) | |
| parent | ea8ae2516ac43028a01c40b58ffa80d3b0afb802 (diff) | |
Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth
Johan Hedberg says:
====================
pull request: bluetooth 2014-12-17
Here's the first direct (i.e. skipping the wireless tree) bluetooth pull
request for you, intended for 3.19. It's just one patch: a fix from
Marcel for for remote service discovery filtering which also fixes a
'used uninitialized' compiler warning.
Please let me know if there are any issues pulling. Thanks.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/mac80211')
0 files changed, 0 insertions, 0 deletions