summaryrefslogtreecommitdiff
path: root/net/bluetooth
diff options
context:
space:
mode:
authorJames Morris <james.l.morris@oracle.com>2015-08-11 11:18:53 +1000
committerJames Morris <james.l.morris@oracle.com>2015-08-11 11:18:53 +1000
commit5ab16579020edb79e215b401399f88c7e07fdaf9 (patch)
tree5fdb2e49d543af7de6b129d6c87abb1967000a6b /net/bluetooth
parent459c15e53cf7e4e88a78ecfb109af5a267c5500a (diff)
parent41a2d5751616e38d1e293e3cb35a6e2bc7a03473 (diff)
Merge branch 'smack-for-4.3' of https://github.com/cschaufler/smack-next into next
Diffstat (limited to 'net/bluetooth')
0 files changed, 0 insertions, 0 deletions