2
0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-24 21:24:00 +08:00
linux-next/drivers/net/wireless/b43legacy
David S. Miller 04c9f416e3 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
	net/batman-adv/bridge_loop_avoidance.c
	net/batman-adv/bridge_loop_avoidance.h
	net/batman-adv/soft-interface.c
	net/mac80211/mlme.c

With merge help from Antonio Quartulli (batman-adv) and
Stephen Rothwell (drivers/net/usb/qmi_wwan.c).

The net/mac80211/mlme.c conflict seemed easy enough, accounting for a
conversion to some new tracing macros.

Signed-off-by: David S. Miller <davem@davemloft.net>
2012-07-10 23:56:33 -07:00
..
b43legacy.h b43legacy: Load firmware from work queue instead of from probe routine 2012-03-13 14:54:15 -04:00
debugfs.c simple_open: automatically convert to simple_open() 2012-04-05 15:25:50 -07:00
debugfs.h
dma.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2012-07-10 23:56:33 -07:00
dma.h b43legacy: Avoid packet losses in the dma worker code 2012-01-04 14:30:43 -05:00
ilt.c Update my e-mail address 2011-07-07 15:18:01 +02:00
ilt.h
Kconfig
leds.c net: fix assignment of 0/1 to bool variables. 2011-12-19 22:27:29 -05:00
leds.h
main.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2012-06-28 17:37:00 -07:00
main.h Update my e-mail address 2011-07-07 15:18:01 +02:00
Makefile
phy.c ssb: remove rev from boardinfo 2012-05-16 12:45:20 -04:00
phy.h Update my e-mail address 2011-07-07 15:18:01 +02:00
pio.c Update my e-mail address 2011-07-07 15:18:01 +02:00
pio.h
radio.c ssb: remove rev from boardinfo 2012-05-16 12:45:20 -04:00
radio.h Update my e-mail address 2011-07-07 15:18:01 +02:00
rfkill.c Update my e-mail address 2011-07-07 15:18:01 +02:00
rfkill.h
sysfs.c Update my e-mail address 2011-07-07 15:18:01 +02:00
sysfs.h
xmit.c wireless: Remove casts to same type 2012-06-06 09:31:33 -07:00
xmit.h