kevin/linux
1
Fork 0
Code
11fe883936
linux/drivers/net/wireless/rt2x00
History
David S. Miller 11fe883936 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 
Conflicts:
	drivers/vhost/net.c
	net/bridge/br_device.c

Fix merge conflict in drivers/vhost/net.c with guidance from
Stephen Rothwell.

Revert the effects of net-2.6 commit 573201f36f
since net-next-2.6 has fixes that make bridge netpoll work properly thus
we don't need it disabled.

Signed-off-by: David S. Miller <davem@davemloft.net>
2010-07-20 18:25:24 -07:00
..
Kconfig
Makefile
rt2x00.h rt2x00: Move driver callback functions into the ops structure 2010-07-12 16:05:37 -04:00
rt2x00config.c rt2x00: Add missing TSF sync mode for AP operation 2010-07-12 16:05:37 -04:00
rt2x00crypto.c
rt2x00debug.c
rt2x00debug.h
rt2x00dev.c Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 2010-07-20 18:25:24 -07:00
rt2x00dump.h
rt2x00firmware.c
rt2x00ht.c
rt2x00leds.c
rt2x00leds.h
rt2x00lib.h rt2x00: Implement watchdog monitoring 2010-07-12 16:05:34 -04:00
rt2x00link.c rt2x00: Implement watchdog monitoring 2010-07-12 16:05:34 -04:00
rt2x00mac.c rt2x00: Allow beacon update without scheduling a work 2010-07-12 16:05:34 -04:00
rt2x00pci.c rt2x00: Convert rt2x00 to use threaded interrupts 2010-07-12 16:05:34 -04:00
rt2x00pci.h
rt2x00queue.c rt2x00: Implement watchdog monitoring 2010-07-12 16:05:34 -04:00
rt2x00queue.h rt2x00: Implement watchdog monitoring 2010-07-12 16:05:34 -04:00
rt2x00reg.h rt2x00: Add missing TSF sync mode for AP operation 2010-07-12 16:05:37 -04:00
rt2x00soc.c
rt2x00soc.h
rt2x00usb.c rt2x00: Implement watchdog monitoring 2010-07-12 16:05:34 -04:00
rt2x00usb.h rt2x00: Implement watchdog monitoring 2010-07-12 16:05:34 -04:00
rt61pci.c rt2x00: Remove set_tim callback from PCI drivers 2010-07-12 16:05:35 -04:00
rt61pci.h
rt73usb.c rt2x00: Convert rt2x00 to use threaded interrupts 2010-07-12 16:05:34 -04:00
rt73usb.h
rt2400pci.c rt2x00: Remove set_tim callback from PCI drivers 2010-07-12 16:05:35 -04:00
rt2400pci.h
rt2500pci.c rt2x00: Remove set_tim callback from PCI drivers 2010-07-12 16:05:35 -04:00
rt2500pci.h
rt2500usb.c rt2x00: Convert rt2x00 to use threaded interrupts 2010-07-12 16:05:34 -04:00
rt2500usb.h
rt2800.h Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem 2010-07-13 15:57:29 -04:00
rt2800lib.c rt2x00: Move common firmware loading into rt2800lib 2010-07-12 16:05:37 -04:00
rt2800lib.h rt2x00: Move driver callback functions into the ops structure 2010-07-12 16:05:37 -04:00
rt2800pci.c rt2x00: Move driver callback functions into the ops structure 2010-07-12 16:05:37 -04:00
rt2800pci.h
rt2800usb.c rt2x00: Move driver callback functions into the ops structure 2010-07-12 16:05:37 -04:00
rt2800usb.h