system/linux
system/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux synced 2024-10-08 12:22:38 +00:00
Code Issues Packages Projects Releases Wiki Activity
linux/include/net/bluetooth
History
David S. Miller 4fbef95af4 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 
Conflicts:
	drivers/net/ethernet/emulex/benet/be.h
	drivers/net/usb/qmi_wwan.c
	drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h
	include/net/netfilter/nf_conntrack_synproxy.h
	include/net/secure_seq.h

The conflicts are of two varieties:

1) Conflicts with Joe Perches's 'extern' removal from header file
   function declarations.  Usually it's an argument signature change
   or a function being added/removed.  The resolutions are trivial.

2) Some overlapping changes in qmi_wwan.c and be.h, one commit adds
   a new value, another changes an existing value.  That sort of
   thing.

Signed-off-by: David S. Miller <davem@davemloft.net>
2013-10-01 17:06:14 -04:00
..
a2mp.h Bluetooth: AMP: Use set_bit / test_bit for amp_mgr state 2013-01-09 17:05:05 -02:00
amp.h Bluetooth: AMP: Use l2cap_physical_cfm in phylink complete evt 2012-11-01 20:27:10 -02:00
bluetooth.h bluetooth: Remove extern from function prototypes 2013-09-23 16:29:41 -04:00
hci.h Bluetooth: Introduce a new HCI_RFKILLED flag 2013-09-18 12:37:27 -05:00
hci_core.h bluetooth: Remove extern from function prototypes 2013-09-23 16:29:41 -04:00
hci_mon.h Bluetooth: Fix coding style in all .h files 2012-03-07 00:04:25 -03:00
l2cap.h Bluetooth: Rename L2CAP_CID_LE_DATA to L2CAP_CID_ATT 2013-06-23 00:23:47 +01:00
mgmt.h Bluetooth: Fix mgmt handling of power on failures 2013-06-12 10:20:55 -04:00
rfcomm.h bluetooth: Remove extern from function prototypes 2013-09-23 16:29:41 -04:00
sco.h Bluetooth: Add Bluetooth socket voice option 2013-08-21 16:47:09 +02:00
smp.h Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless 2012-09-07 15:07:55 -04:00