linux/arch/parisc/include
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
..
asm parisc: mark parisc_terminate() noreturn and cold. 2013-10-13 17:44:49 +02:00
uapi/asm net: introduce SO_MAX_PACING_RATE 2013-09-28 15:35:41 -07:00