forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
linux-pinenote/net/bluetooth
History
David Howells 4c1ac1b491 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 
Conflicts:

	drivers/infiniband/core/iwcm.c
	drivers/net/chelsio/cxgb2.c
	drivers/net/wireless/bcm43xx/bcm43xx_main.c
	drivers/net/wireless/prism54/islpci_eth.c
	drivers/usb/core/hub.h
	drivers/usb/input/hid-core.c
	net/core/netpoll.c

Fix up merge failures with Linus's head and fix new compilation failures.

Signed-Off-By: David Howells <dhowells@redhat.com>
2006-12-05 14:37:56 +00:00
..
bnep [BLUETOOTH]: bnep endianness annotations 2006-12-02 21:21:28 -08:00
cmtp [Bluetooth] Add locking for bt_proto array manipulation 2006-10-15 23:14:34 -07:00
hidp [Bluetooth] Fix HID disconnect NULL pointer dereference 2006-10-20 01:15:05 -07:00
rfcomm [BLUETOOTH] rfcomm endianness bug: param_mask is little-endian on the wire 2006-12-02 21:21:30 -08:00
af_bluetooth.c [Bluetooth] Add locking for bt_proto array manipulation 2006-10-15 23:14:34 -07:00
hci_conn.c [Bluetooth] Support concurrent connect requests 2006-10-15 23:14:30 -07:00
hci_core.c [Bluetooth] Read local version information on device init 2006-09-28 18:01:32 -07:00
hci_event.c [Bluetooth] Handling pending connect attempts after inquiry 2006-11-21 16:16:29 -08:00
hci_sock.c [BLUETOOTH]: Fix unaligned access in hci_send_to_sock. 2006-11-21 16:17:41 -08:00
hci_sysfs.c WorkStruct: make allyesconfig 2006-11-22 14:57:56 +00:00
Kconfig Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
l2cap.c [BLUETOOTH] lockdep: annotate sk_lock nesting in AF_BLUETOOTH 2006-12-02 21:21:35 -08:00
lib.c Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
Makefile Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
sco.c [Bluetooth] Add locking for bt_proto array manipulation 2006-10-15 23:14:34 -07:00