linux-uconsole/net/bluetooth
Colin Cross 3f29a88349 Merge branch 'linux-tegra-2.6.36' into android-tegra-2.6.36
Conflicts:
	drivers/usb/gadget/composite.c

Change-Id: I1a332ec21da62aea98912df9a01cf0282ed50ee1
2010-12-21 18:38:13 -08:00
..
bnep Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 2010-07-07 15:59:38 -07:00
cmtp net: sk_sleep() helper 2010-04-20 16:37:13 -07:00
hidp net: sk_sleep() helper 2010-04-20 16:37:13 -07:00
rfcomm Merge commit 'v2.6.36' into android-2.6.36 2010-10-21 15:00:17 -07:00
af_bluetooth.c Paranoid network. 2010-09-29 17:49:10 -07:00
hci_conn.c Bluetooth: Add BT_POWER L2CAP socket option. 2010-11-10 15:59:50 -08:00
hci_core.c Bluetooth: Add BT_POWER L2CAP socket option. 2010-11-10 15:59:50 -08:00
hci_event.c Bluetooth: Allow SCO/eSCO packet type selection for outgoing SCO connections. 2010-09-29 17:49:29 -07:00
hci_sock.c Bluetooth: Use list_head for HCI blacklist head 2010-07-31 16:06:58 -07:00
hci_sysfs.c Bluetooth: Use list_head for HCI blacklist head 2010-07-31 16:06:58 -07:00
Kconfig Bluetooth: Remove L2CAP Extended Features from Kconfig 2010-07-21 10:39:04 -07:00
l2cap.c Merge branch 'linux-tegra-2.6.36' into android-tegra-2.6.36 2010-12-21 18:38:13 -08:00
lib.c [NET] BLUETOOTH: Fix whitespace errors. 2007-02-10 23:19:20 -08:00
Makefile
sco.c Bluetooth: Allow SCO/eSCO packet type selection for outgoing SCO connections. 2010-09-29 17:49:29 -07:00