leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity
420136cccb
linux/drivers/bluetooth
History
David S. Miller 56a4342dfe Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 
Conflicts:
	drivers/net/ethernet/qlogic/qlcnic/qlcnic_sriov_pf.c
	net/ipv6/ip6_tunnel.c
	net/ipv6/ip6_vti.c

ipv6 tunnel statistic bug fixes conflicting with consolidation into
generic sw per-cpu net stats.

qlogic conflict between queue counting bug fix and the addition
of multiple MAC address support.

Signed-off-by: David S. Miller <davem@davemloft.net>
2014-01-06 17:37:45 -05:00
..
ath3k.c Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2014-01-06 17:37:45 -05:00
bcm203x.c Bluetooth: Use devm_kzalloc in bcm203x.c file. 2012-08-06 15:03:00 -03:00
bfusb.c Bluetooth: Declare bfusb_table[] as const 2013-10-11 17:05:20 +02:00
bluecard_cs.c Bluetooth: Remove pointless parameter check in bluecard_hci_send_frame() 2013-10-11 16:57:15 +02:00
bpa10x.c Bluetooth: Declare bpa10x_table[] as const 2013-10-11 17:05:22 +02:00
bt3c_cs.c Bluetooth: Remove pointless parameter check in bt3c_hci_send_frame() 2013-10-11 16:57:27 +02:00
btmrvl_debugfs.c Bluetooth: replace strict_strtol() with kstrtol() 2013-07-25 14:15:25 +01:00
btmrvl_drv.h Bluetooth: btmrvl: remove cal-data byte swapping and redundant mem copy 2013-12-04 11:09:03 -02:00
btmrvl_main.c Bluetooth: btmrvl: remove cal-data byte swapping and redundant mem copy 2013-12-04 11:09:03 -02:00
btmrvl_sdio.c Bluetooth: btmrvl: use cal-data from device-tree instead of conf file 2013-12-04 11:09:03 -02:00
btmrvl_sdio.h Bluetooth: btmrvl: use cal-data from device-tree instead of conf file 2013-12-04 11:09:03 -02:00
btsdio.c Bluetooth: Add hdev parameter to hdev->send driver callback 2013-10-11 15:28:03 +02:00
btuart_cs.c Bluetooth: Remove pointless parameter check in btuart_hci_send_frame() 2013-10-11 17:00:02 +02:00
btusb.c Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2014-01-06 17:37:45 -05:00
btwilink.c Bluetooth: Add hdev parameter to hdev->send driver callback 2013-10-11 15:28:03 +02:00
dtl1_cs.c Bluetooth: Remove pointless parameter check in dtl1_hci_send_frame() 2013-10-11 17:00:08 +02:00
hci_ath.c tty: move the termios object into the tty 2012-07-16 13:00:41 -07:00
hci_bcsp.c Bluetooth: Provide hdev parameter to hci_recv_frame() driver callback 2013-10-11 09:45:34 +02:00
hci_h4.c Bluetooth: Remove unused h4_check_data_len() function 2013-10-11 07:51:09 +02:00
hci_h5.c Bluetooth: Provide hdev parameter to hci_recv_frame() driver callback 2013-10-11 09:45:34 +02:00
hci_ldisc.c Bluetooth: Remove pointless parameter check in hci_uart_send_frame() 2013-10-11 17:00:24 +02:00
hci_ll.c Bluetooth: Add hdev parameter to hdev->send driver callback 2013-10-11 15:28:03 +02:00
hci_uart.h Bluetooth: Add delayed init sequence support for UART controllers 2012-07-17 14:48:29 -03:00
hci_vhci.c Bluetooth: Remove pointless parameter check in vhci_send_frame() 2013-10-11 17:00:38 +02:00
Kconfig Bluetooth: btmrvl: support Marvell Bluetooth device SD8897 2013-06-12 10:20:54 -04:00
Makefile Bluetooth: Enable -D__CHECK_ENDIAN__ for sparse by default 2013-10-02 09:10:05 +03:00