]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
projects / users / jedix / linux-maple.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9437a24 ebaf579)
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth...
authorJohn W. Linville <linville@tuxdriver.com>
Mon, 18 Mar 2013 19:17:11 +0000 (15:17 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Mon, 18 Mar 2013 19:17:11 +0000 (15:17 -0400)
1  2 
drivers/bluetooth/ath3k.c patch | diff1 | diff2 | blob | history
net/bluetooth/sco.c patch | diff1 | diff2 | blob | history

diff --cc drivers/bluetooth/ath3k.c
Simple merge
diff --cc net/bluetooth/sco.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.