黄涛 14d96d73a2 Merge remote-tracking branch 'stable/linux-3.0.y' into develop-3.0 ... Merge v3.0.65 Conflicts: Makefile drivers/net/wireless/ath/ath9k/beacon.c drivers/net/wireless/ath/ath9k/htc_hst.c		2013-02-18 12:31:44 +08:00
..
bnep	Merge commit 'v3.0.8' into android-3.0	2011-10-27 15:01:19 -07:00
cmtp	Bluetooth: Kill set but unused variable 'cmd' in cmtp_recv_capimsg()	2011-07-11 11:59:18 -07:00
hidp	Merge remote-tracking branch 'stable/linux-3.0.y' into develop-3.0	2013-02-18 12:31:44 +08:00
rfcomm	Merge remote-tracking branch 'stable/linux-3.0.y' into develop-3.0	2012-10-08 10:28:29 +08:00
af_bluetooth.c	revert android-tegra-2.6.36-honeycomb-mr1-9001adc to v2.6.36	2011-10-28 16:02:47 +08:00
hci_conn.c	Bluetooth: Fix l2cap conn failures for ssp devices	2012-04-13 08:14:08 -07:00
hci_core.c	Merge remote-tracking branch 'stable/linux-3.0.y' into develop-3.0	2013-01-15 12:45:19 +08:00
hci_event.c	Merge remote-tracking branch 'stable/linux-3.0.y' into develop-3.0	2013-02-18 12:31:44 +08:00
hci_sock.c	Merge remote-tracking branch 'stable/linux-3.0.y' into develop-3.0	2012-10-08 10:28:29 +08:00
hci_sysfs.c
Kconfig	Bluetooth: uses crypto interfaces, select CRYPTO	2011-07-11 11:59:25 -07:00
l2cap_core.c	Bluetooth: l2cap: Fix lost wakeup waiting for ERTM acks	2011-08-02 15:11:15 -07:00
l2cap_sock.c	Merge remote-tracking branch 'stable/linux-3.0.y' into develop-3.0	2012-10-08 10:28:29 +08:00
lib.c	Bluetooth: Add bt_printk	2011-07-11 11:59:26 -07:00
Makefile	Bluetooth: Implement the first SMP commands	2011-07-11 11:59:20 -07:00
mgmt.c	Bluetooth: Add support for storing the key size	2011-07-11 11:59:36 -07:00
sco.c	revert android-tegra-2.6.36-honeycomb-mr1-9001adc to v2.6.36	2011-10-28 16:02:47 +08:00
smp.c	Bluetooth: Add support for storing the key size	2011-07-11 11:59:36 -07:00