]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'bluetooth/master'
authorThierry Reding <treding@nvidia.com>
Thu, 24 Oct 2013 12:35:44 +0000 (14:35 +0200)
committerThierry Reding <treding@nvidia.com>
Thu, 24 Oct 2013 12:35:44 +0000 (14:35 +0200)
1  2 
include/net/bluetooth/bluetooth.h
include/net/bluetooth/hci_core.h

Simple merge
Simple merge