projects / cascardo / linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: dcd6077 3c57e86)
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorJohn W. Linville <linville@tuxdriver.com>
Fri, 8 Nov 2013 14:03:10 +0000 (09:03 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Fri, 8 Nov 2013 14:03:10 +0000 (09:03 -0500)
1  2 
include/net/bluetooth/bluetooth.h patch | diff1 | diff2 | blob | history
include/net/bluetooth/hci_core.h patch | diff1 | diff2 | blob | history

diff --cc include/net/bluetooth/bluetooth.h
Simple merge
diff --cc include/net/bluetooth/hci_core.h
Simple merge
Unnamed repository; edit this file 'description' to name the repository.