summaryrefslogtreecommitdiff
path: root/net/switchdev/switchdev.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2016-05-16 13:56:37 -0400
committerDavid S. Miller <davem@davemloft.net>2016-05-16 13:56:37 -0400
commit2ffd7e035601268915a393ae0b7cac34c27e190e (patch)
tree39b976a58eb3acdf0a47999aebc2696a2c8f737f /net/switchdev/switchdev.c
parent14d7e48751925b4d48f0fd2317b0570fd243f6fd (diff)
parent72f9f8b58bc743e6b6abdc68f60db98486c3ffcf (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 2016-05-14 Here are two more Bluetooth patches for the 4.7 kernel which we wanted to get into net-next before the merge window opens. Please let me know if there are any issues pulling. Thanks. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/switchdev/switchdev.c')
0 files changed, 0 insertions, 0 deletions