summaryrefslogtreecommitdiff
path: root/net/bluetooth
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2011-12-07 15:06:33 -0500
committerDavid S. Miller <davem@davemloft.net>2011-12-07 15:06:33 -0500
commit1af32f0fcf33ddca52c8fd2b5bc84c129dcb1bdd (patch)
treef749fbe49714be639e4c9579178f9ae0adf4a7de /net/bluetooth
parent28d8ea2d568534026ccda3e8936f5ea1e04a86a1 (diff)
parent797399b415b78dacdbcaffdb89e46e369ec88b98 (diff)
Merge branch 'batman-adv/maint' of git://git.open-mesh.org/linux-merge
Diffstat (limited to 'net/bluetooth')
0 files changed, 0 insertions, 0 deletions