projects / cascardo / linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f68e556 66f3b91)
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth...
authorJohn W. Linville <linville@tuxdriver.com>
Mon, 9 Apr 2012 19:47:49 +0000 (15:47 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Mon, 9 Apr 2012 19:47:49 +0000 (15:47 -0400)
1  2 
MAINTAINERS patch | diff1 | diff2 | blob | history
net/bluetooth/hci_core.c patch | diff1 | diff2 | blob | history
net/bluetooth/l2cap_core.c patch | diff1 | diff2 | blob | history

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