Files
kernel_arpi/include/uapi/linux
David S. Miller 4fbef95af4 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
	drivers/net/ethernet/emulex/benet/be.h
	drivers/net/usb/qmi_wwan.c
	drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h
	include/net/netfilter/nf_conntrack_synproxy.h
	include/net/secure_seq.h

The conflicts are of two varieties:

1) Conflicts with Joe Perches's 'extern' removal from header file
   function declarations.  Usually it's an argument signature change
   or a function being added/removed.  The resolutions are trivial.

2) Some overlapping changes in qmi_wwan.c and be.h, one commit adds
   a new value, another changes an existing value.  That sort of
   thing.

Signed-off-by: David S. Miller <davem@davemloft.net>
2013-10-01 17:06:14 -04:00
..
2013-04-26 16:08:16 +10:00
2013-09-05 20:46:06 -04:00
2013-08-02 12:33:54 -07:00
2012-10-16 18:49:15 -07:00
2013-03-27 14:37:47 +00:00
2013-06-24 16:39:05 -07:00
2013-03-28 01:20:42 -04:00
2013-08-31 22:30:00 -04:00
2013-08-13 15:10:22 -07:00
2013-08-21 12:21:45 -07:00
2013-09-04 13:12:43 -04:00
2013-09-04 13:12:43 -04:00
2013-06-26 18:01:46 +09:00
2013-07-09 10:33:25 -07:00
2013-02-27 19:10:22 -08:00
2013-04-19 14:57:57 -04:00
2012-11-16 10:15:35 -08:00
2013-08-26 14:03:13 -07:00
2013-07-24 17:54:48 -07:00
2013-03-22 16:19:59 -07:00
2013-03-21 12:36:33 -04:00
2013-09-04 11:28:04 -06:00
2013-05-02 13:40:15 +03:00