John W. Linville 312fef7d18 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/padovan/bluetooth-next ... Conflicts: net/bluetooth/l2cap_sock.c net/bluetooth/mgmt.c		2011-11-09 14:54:33 -05:00
..
bnep.h	Bluetooth: bnep: Fix deadlock in session deletion	2011-08-11 19:50:27 -03:00
core.c	Bluetooth: replace list_for_each with list_for_each_entry whenever possible	2011-11-07 17:24:46 -02:00
Kconfig
Makefile
netdev.c	net: remove use of ndo_set_multicast_list in drivers	2011-08-17 20:22:03 -07:00
sock.c