dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity
This repository has been archived on 2022-02-17. You can view files and clone it, but cannot push or open issues or pull requests.
linux-2.6/net/bluetooth
History
David S. Miller b26d344c6b Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 
Conflicts:
	drivers/net/caif/caif_hsi.c
	drivers/net/usb/qmi_wwan.c

The qmi_wwan merge was trivial.

The caif_hsi.c, on the other hand, was not.  It's a conflict between
1c385f1fdf ("caif-hsi: Replace platform
device with ops structure.") in the net-next tree and commit
39abbaef19 ("caif-hsi: Postpone init of
HIS until open()") in the net tree.

I did my best with that one and will ask Sjur to check it out.

Signed-off-by: David S. Miller <davem@davemloft.net>
 		2012-06-28 17:37:00 -07:00
..
bnep Bluetooth: Remove unnecessary headers include 2012-06-05 06:34:08 +03:00
cmtp Remove all #inclusions of asm/system.h 2012-03-28 18:30:03 +01:00
hidp Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2012-06-28 17:37:00 -07:00
rfcomm Bluetooth: Remove unnecessary headers include 2012-06-05 06:34:08 +03:00
Kconfig Bluetooth: Fix Kconfig help description 2012-02-29 18:50:25 +02:00
Makefile Bluetooth: A2MP: Create A2MP channel 2012-06-05 06:34:11 +03:00
a2mp.c Bluetooth: Create empty l2cap ops function 2012-06-05 06:34:16 +03:00
af_bluetooth.c Bluetooth: Fix checking the wrong flag when accepting a socket 2012-06-05 06:34:16 +03:00
hci_conn.c Bluetooth: Allow only one LE connection attempt 2012-06-05 06:34:15 +03:00
hci_core.c Bluetooth: Remove magic disconnect reason 2012-06-05 06:34:16 +03:00
hci_event.c Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless 2012-06-13 15:35:35 -04:00
hci_sock.c Bluetooth: Remove unnecessary headers include 2012-06-05 06:34:08 +03:00
hci_sysfs.c Bluetooth: Remove unnecessary headers include 2012-06-05 06:34:08 +03:00
l2cap_core.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2012-06-25 15:50:32 -07:00
l2cap_sock.c Bluetooth: Rename L2CAP_LE_DEFAULT_MTU 2012-06-05 06:34:16 +03:00
lib.c Bluetooth: Remove unnecessary headers include 2012-06-05 06:34:08 +03:00
mgmt.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2012-06-25 15:50:32 -07:00
sco.c Bluetooth: Remove unnecessary headers include 2012-06-05 06:34:08 +03:00
smp.c Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless 2012-06-13 15:35:35 -04:00