David S. Miller b26d344c6b Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/caif/caif_hsi.c drivers/net/usb/qmi_wwan.c The qmi_wwan merge was trivial. The caif_hsi.c, on the other hand, was not. It's a conflict between 1c385f1fdf ("caif-hsi: Replace platform device with ops structure.") in the net-next tree and commit 39abbaef19 ("caif-hsi: Postpone init of HIS until open()") in the net tree. I did my best with that one and will ask Sjur to check it out. Signed-off-by: David S. Miller <davem@davemloft.net>		2012-06-28 17:37:00 -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	wireless: Remove casts to same type	2012-06-06 09:31: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