diff options
| author | David S. Miller <davem@davemloft.net> | 2014-07-14 05:42:17 (GMT) |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-07-14 05:42:17 (GMT) |
| commit | 66568b392539fc8224f4d7070a55d56e9d13c150 (patch) | |
| tree | 6211e5874529a7e17ccecd0fca9a872b44c03897 /include/net/stp.h | |
| parent | e3f0b86b996d86940357e5ca9788771618d731f1 (diff) | |
| parent | 95d01a669bd35d0e8eb28dd8a946876c00a9a61a (diff) | |
| download | linux-66568b392539fc8224f4d7070a55d56e9d13c150.tar.xz | |
Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next
John W. Linville says:
====================
Please pull this batch of updates intended for the 3.17 stream...
This is primarily a Bluetooth pull. Gustavo says:
"A lot of patches to 3.17. The bulk of changes here are for LE support.
The 6loWPAN over Bluetooth now has it own module, we also have support for
background auto-connection and passive scanning, Bluetooth device address
provisioning, support for reading Bluetooth clock values and LE connection
parameters plus many many fixes."
The balance is just a pull of the wireless.git tree, to avoid some
pending merge problems.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net/stp.h')
0 files changed, 0 insertions, 0 deletions