David S. Miller 8decf86879 Merge branch 'master' of github.com:davem330/net ...

Conflicts:
	MAINTAINERS
	drivers/net/Kconfig
	drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c
	drivers/net/ethernet/broadcom/tg3.c
	drivers/net/wireless/iwlwifi/iwl-pci.c
	drivers/net/wireless/iwlwifi/iwl-trans-tx-pcie.c
	drivers/net/wireless/rt2x00/rt2800usb.c
	drivers/net/wireless/wl12xx/main.c

2011-09-22 03:23:13 -04:00

..

bnep.h

Bluetooth: bnep: Fix deadlock in session deletion

2011-08-11 19:50:27 -03:00

core.c

Bluetooth: bnep: Fix deadlock in session deletion

2011-08-11 19:50:27 -03:00

Kconfig

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

Makefile

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

netdev.c

net: remove use of ndo_set_multicast_list in drivers

2011-08-17 20:22:03 -07:00

sock.c

Bluetooth: Use #include <linux/uaccess.h> instead of <asm/uaccess.h>

2011-03-31 14:22:55 -03:00