Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-15 00:21:59 +00:00
Code Issues Packages Projects Releases Wiki Activity
5869e795e0
linux/drivers/net/wireless/rt2x00
History
David S. Miller 04f58c8854 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 
Conflicts:
	Documentation/devicetree/bindings/net/micrel-ks8851.txt
	net/core/netpoll.c

The net/core/netpoll.c conflict is a bug fix in 'net' happening
to code which is completely removed in 'net-next'.

In micrel-ks8851.txt we simply have overlapping changes.

Signed-off-by: David S. Miller <davem@davemloft.net>
2014-03-25 20:29:20 -04:00
..
Kconfig rt2x00: rt2800pci: move SoC specific code into a separate module 2013-10-18 14:07:00 -04:00
Makefile rt2x00: rt2800pci: move SoC specific code into a separate module 2013-10-18 14:07:00 -04:00
rt2x00.h rt2x00: Fix FSF address in file headers 2013-12-11 10:56:19 -05:00
rt2x00config.c rt2x00: Fix FSF address in file headers 2013-12-11 10:56:19 -05:00
rt2x00crypto.c rt2x00: Fix FSF address in file headers 2013-12-11 10:56:19 -05:00
rt2x00debug.c net: Replace min macro with min_t 2014-03-03 15:35:54 -05:00
rt2x00debug.h rt2x00: Fix FSF address in file headers 2013-12-11 10:56:19 -05:00
rt2x00dev.c rt2x00: use ether_addr_equal_64bits 2014-01-03 15:36:59 -05:00
rt2x00dump.h rt2x00: Fix FSF address in file headers 2013-12-11 10:56:19 -05:00
rt2x00firmware.c rt2x00: Fix FSF address in file headers 2013-12-11 10:56:19 -05:00
rt2x00leds.c rt2x00: Fix FSF address in file headers 2013-12-11 10:56:19 -05:00
rt2x00leds.h rt2x00: Fix FSF address in file headers 2013-12-11 10:56:19 -05:00
rt2x00lib.h rt2x00: Fix FSF address in file headers 2013-12-11 10:56:19 -05:00
rt2x00link.c rt2x00: Fix FSF address in file headers 2013-12-11 10:56:19 -05:00
rt2x00mac.c rt2x00: Fix FSF address in file headers 2013-12-11 10:56:19 -05:00
rt2x00mmio.c rt2x00: Fix FSF address in file headers 2013-12-11 10:56:19 -05:00
rt2x00mmio.h rt2x00: Fix FSF address in file headers 2013-12-11 10:56:19 -05:00
rt2x00pci.c rt2x00: Fix FSF address in file headers 2013-12-11 10:56:19 -05:00
rt2x00pci.h rt2x00: Fix FSF address in file headers 2013-12-11 10:56:19 -05:00
rt2x00queue.c rt2x00: Fix FSF address in file headers 2013-12-11 10:56:19 -05:00
rt2x00queue.h rt2x00: Fix FSF address in file headers 2013-12-11 10:56:19 -05:00
rt2x00reg.h rt2x00: Fix FSF address in file headers 2013-12-11 10:56:19 -05:00
rt2x00soc.c rt2x00: Fix FSF address in file headers 2013-12-11 10:56:19 -05:00
rt2x00soc.h rt2x00: Fix FSF address in file headers 2013-12-11 10:56:19 -05:00
rt2x00usb.c rt2x00: Fix FSF address in file headers 2013-12-11 10:56:19 -05:00
rt2x00usb.h rt2x00: Fix FSF address in file headers 2013-12-11 10:56:19 -05:00
rt61pci.c wireless: delete non-required instances of include <linux/init.h> 2014-01-03 15:37:01 -05:00
rt61pci.h rt2x00: Fix FSF address in file headers 2013-12-11 10:56:19 -05:00
rt73usb.c wireless: delete non-required instances of include <linux/init.h> 2014-01-03 15:37:01 -05:00
rt73usb.h rt2x00: Fix FSF address in file headers 2013-12-11 10:56:19 -05:00
rt2400pci.c wireless: delete non-required instances of include <linux/init.h> 2014-01-03 15:37:01 -05:00
rt2400pci.h rt2x00: Fix FSF address in file headers 2013-12-11 10:56:19 -05:00
rt2500pci.c rt2500: disable PS by default 2014-02-04 15:30:07 -05:00
rt2500pci.h rt2x00: Fix FSF address in file headers 2013-12-11 10:56:19 -05:00
rt2500usb.c rt2500: disable PS by default 2014-02-04 15:30:07 -05:00
rt2500usb.h rt2x00: Fix FSF address in file headers 2013-12-11 10:56:19 -05:00
rt2800.h rt2x00: Fix FSF address in file headers 2013-12-11 10:56:19 -05:00
rt2800lib.c Revert "rt2x00: rt2800lib: Update BBP register initialization for RT53xx" 2014-03-13 14:57:27 -04:00
rt2800lib.h rt2x00: Fix FSF address in file headers 2013-12-11 10:56:19 -05:00
rt2800mmio.c rt2x00: Fix FSF address in file headers 2013-12-11 10:56:19 -05:00
rt2800mmio.h rt2x00: Fix FSF address in file headers 2013-12-11 10:56:19 -05:00
rt2800pci.c rt2x00: Fix FSF address in file headers 2013-12-11 10:56:19 -05:00
rt2800pci.h rt2x00: Fix FSF address in file headers 2013-12-11 10:56:19 -05:00
rt2800soc.c rt2x00: Fix FSF address in file headers 2013-12-11 10:56:19 -05:00
rt2800usb.c wireless/rt2x00: don't use PREPARE_WORK in rt2800usb.c 2014-02-24 15:38:36 -05:00
rt2800usb.h rt2x00: Fix FSF address in file headers 2013-12-11 10:56:19 -05:00