forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
linux-pinenote/drivers/net/hamradio
History
David S. Miller c3fa32b976 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 
Conflicts:
	drivers/net/usb/qmi_wwan.c
	include/net/dst.h

Trivial merge conflicts, both were overlapping changes.

Signed-off-by: David S. Miller <davem@davemloft.net>
2013-10-23 16:49:34 -04:00
..
6pack.c sections: fix section conflicts in drivers/net/hamradio 2012-10-06 03:04:43 +09:00
baycom_epp.c drivers/net: rename random32() to prandom_u32() 2013-05-07 18:38:27 -07:00
baycom_par.c Remove all #inclusions of asm/system.h 2012-03-28 18:30:03 +01:00
baycom_ser_fdx.c hamradio: baycom: remove deprecated IRQF_DISABLED 2013-09-30 15:08:13 -04:00
baycom_ser_hdx.c hamradio: baycom: remove deprecated IRQF_DISABLED 2013-09-30 15:08:13 -04:00
bpqether.c net: pass info struct via netdevice notifier 2013-05-28 13:11:01 -07:00
dmascc.c drivers:net:misc: Remove unnecessary alloc/OOM messages 2013-02-04 13:22:35 -05:00
hdlcdrv.c drivers/net: rename random32() to prandom_u32() 2013-05-07 18:38:27 -07:00
Kconfig tty: Added a CONFIG_TTY option to allow removal of TTY 2013-01-18 16:15:27 -08:00
Makefile
mkiss.c sections: fix section conflicts in drivers/net/hamradio 2012-10-06 03:04:43 +09:00
scc.c net: hamradio/scc: remove deprecated IRQF_DISABLED 2013-10-07 15:53:52 -04:00
yam.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2013-10-23 16:49:34 -04:00
z8530.h