John W. Linville 57adc1fcba Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem ... Conflicts: drivers/net/wireless/b43/dma.c drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c		2012-01-03 15:16:34 -05:00
..
core.c	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem	2012-01-03 15:16:34 -05:00
Kconfig	Bluetooth: Always compile SCO and L2CAP in Bluetooth Core	2011-12-21 02:21:08 -02:00
Makefile
sock.c	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/padovan/bluetooth-next	2011-11-09 14:54:33 -05:00
tty.c	Bluetooth: replace list_for_each with list_for_each_entry whenever possible	2011-11-07 17:24:46 -02:00