]> www.infradead.org Git - users/willy/xarray.git/commitdiff
projects / users / willy / xarray.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 55cec50 0b27a4b)
Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetoot...
authorJohn W. Linville <linville@tuxdriver.com>
Mon, 3 Dec 2012 18:46:03 +0000 (13:46 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Mon, 3 Dec 2012 18:46:03 +0000 (13:46 -0500)
1  2 
net/bluetooth/hci_core.c patch | diff1 | diff2 | blob | history
net/bluetooth/mgmt.c patch | diff1 | diff2 | blob | history

diff --cc net/bluetooth/hci_core.c
Simple merge
diff --cc net/bluetooth/mgmt.c
Simple merge
XArray, radix tree and IDR