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
..
bnep.h	Bluetooth: bnep: Fix deadlock in session deletion	2011-08-11 19:50:27 -03:00
core.c	module_param: make bool parameters really bool (net & drivers/net)	2011-12-19 22:27:29 -05:00
Kconfig	Bluetooth: Always compile SCO and L2CAP in Bluetooth Core	2011-12-21 02:21:08 -02:00
Makefile
netdev.c	net: remove use of ndo_set_multicast_list in drivers	2011-08-17 20:22:03 -07:00
sock.c