linux/net/bluetooth
黄涛 6e2688ca84 Merge remote branch 'linux-2.6.32.y/master' into develop
Conflicts:
	drivers/i2c/busses/Kconfig
	drivers/net/dm9000.c
	drivers/net/wireless/libertas/if_sdio1.c
	drivers/usb/serial/option.c
	net/bluetooth/rfcomm/core.c
2010-12-16 20:54:24 +08:00
..
bnep net: Add DEVTYPE support for Ethernet based devices 2009-09-11 12:54:55 -07:00
cmtp isdn: rename capi_ctr_reseted() to capi_ctr_down() 2009-06-08 00:45:50 -07:00
hidp HID: consolidate connect and disconnect into core code 2009-09-17 15:15:11 +02:00
rfcomm Merge remote branch 'linux-2.6.32.y/master' into develop 2010-12-16 20:54:24 +08:00
af_bluetooth.c Paranoid network. 2010-02-08 15:07:32 -08:00
hci_conn.c Bluetooth: Allow SCO/eSCO packet type selection for outgoing SCO connections. 2010-02-24 14:40:25 -08:00
hci_core.c Bluetooth: Use non-flushable pb flag by default for ACL data on capable chipsets. 2010-03-09 12:09:56 -08:00
hci_event.c Bluetooth: Allow SCO/eSCO packet type selection for outgoing SCO connections. 2010-02-24 14:40:25 -08:00
hci_sock.c net: Make setsockopt() optlen be unsigned. 2009-09-30 16:12:20 -07:00
hci_sysfs.c bluetooth: scheduling while atomic bug fix 2009-10-19 19:36:45 -07:00
Kconfig Bluetooth: Add missing selection of CONFIG_CRC16 for L2CAP layer 2009-08-24 16:34:35 -07:00
l2cap.c Merge remote branch 'linux-2.6.32.y/master' into develop 2010-12-16 20:54:24 +08:00
lib.c
Makefile
sco.c Merge remote branch 'linux-2.6.32.y/master' into develop 2010-12-16 20:54:24 +08:00