David S. Miller
6e0895c2ea
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...
Conflicts:
drivers/net/ethernet/emulex/benet/be_main.c
drivers/net/ethernet/intel/igb/igb_main.c
drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c
include/net/scm.h
net/batman-adv/routing.c
net/ipv4/tcp_input.c
The e{uid,gid} --> {uid,gid} credentials fix conflicted with the
cleanup in net-next to now pass cred structs around.
The be2net driver had a bug fix in 'net' that overlapped with the VLAN
interface changes by Patrick McHardy in net-next.
An IGB conflict existed because in 'net' the build_skb() support was
reverted, and in 'net-next' there was a comment style fix within that
code.
Several batman-adv conflicts were resolved by making sure that all
calls to batadv_is_my_mac() are changed to have a new bat_priv first
argument.
Eric Dumazet's TS ECR fix in TCP in 'net' conflicted with the F-RTO
rewrite in 'net-next', mostly overlapping changes.
Thanks to Stephen Rothwell and Antonio Quartulli for help with several
of these merge resolutions.
Signed-off-by: David S. Miller <davem@davemloft.net>
2013-04-22 20:32:51 -04:00
2013-04-22 20:32:51 -04:00
2013-04-02 00:23:58 +02:00
2013-04-18 20:27:55 +02:00
2013-02-21 12:05:51 -08:00
2013-01-21 12:20:19 +01:00
2013-01-23 12:55:29 +01:00
2013-04-18 20:27:55 +02:00
2011-01-18 18:12:24 +01:00
2013-04-19 17:55:29 -04:00
2013-04-18 20:27:55 +02:00
2013-04-19 17:55:29 -04:00
2012-06-16 15:08:49 +02:00
2013-04-18 20:27:55 +02:00
2011-04-04 15:21:02 +02:00
2013-04-18 20:27:55 +02:00
2008-01-31 19:28:07 -08:00
2013-04-18 20:27:55 +02:00
2013-04-18 20:27:55 +02:00
2008-04-14 11:15:52 +02:00
2013-01-23 12:56:23 +01:00
2011-01-18 18:12:24 +01:00
2013-03-19 17:02:18 +01:00
2013-04-18 20:27:55 +02:00
2013-04-05 20:12:54 +02:00
2012-07-04 19:37:22 +02:00
2013-04-18 20:27:55 +02:00
2013-04-18 20:27:55 +02:00
2013-04-18 20:27:55 +02:00
2013-04-18 20:27:55 +02:00
2013-04-05 20:12:54 +02:00
2013-04-18 20:27:55 +02:00
2013-02-19 02:48:05 +01:00
2013-04-06 14:03:18 +02:00
2013-01-18 00:28:18 +01:00
2013-04-18 20:27:55 +02:00
2013-04-18 20:27:55 +02:00
2013-01-23 12:56:02 +01:00
2013-01-23 12:55:39 +01:00
2012-09-03 13:52:54 +02:00
2013-04-05 21:08:10 +02:00
2013-04-18 20:27:55 +02:00
2013-04-22 20:32:51 -04:00
2013-02-19 02:48:05 +01:00
2013-04-18 20:27:55 +02:00
2013-02-19 02:48:05 +01:00
2012-08-30 03:00:14 +02:00
2012-08-30 03:00:14 +02:00
2012-08-30 03:00:14 +02:00
2012-08-30 03:00:14 +02:00
2012-08-30 03:00:14 +02:00
2012-08-30 03:00:14 +02:00
2012-08-30 03:00:14 +02:00
2013-02-19 02:48:05 +01:00
2013-02-19 02:48:05 +01:00
2013-04-18 20:27:55 +02:00
2009-09-30 16:12:20 -07:00
2011-02-17 11:32:38 +01:00
2013-03-25 14:21:30 +01:00
2013-02-27 19:10:24 -08:00
2012-11-21 23:50:14 +01:00
2013-04-19 17:55:29 -04:00
2013-04-19 14:58:36 -04:00
2012-06-23 02:13:38 +02:00
2013-04-19 14:58:36 -04:00
2013-04-18 20:27:55 +02:00
2011-12-16 15:49:52 -05:00
2013-03-04 14:45:25 +01:00
2013-01-21 12:20:19 +01:00
2010-07-15 17:20:46 +02:00
2010-11-15 13:57:56 +01:00
2010-06-08 16:09:52 +02:00
2010-05-11 18:33:37 +02:00
2011-12-25 02:21:45 -05:00
2013-01-18 00:28:15 +01:00
2013-02-27 19:10:24 -08:00
2010-05-11 18:33:37 +02:00
2010-05-11 18:31:17 +02:00
2013-04-18 20:27:55 +02:00
2011-01-18 06:33:54 +01:00
2013-02-05 01:49:26 +01:00
2010-05-11 18:35:27 +02:00
2011-02-03 00:05:43 +01:00
2010-05-11 18:33:37 +02:00
2011-05-10 10:00:21 +02:00
2011-12-27 20:45:25 +01:00
2010-05-11 18:35:27 +02:00
2013-04-18 20:27:55 +02:00
2010-05-11 18:33:37 +02:00
2011-07-01 16:11:15 -07:00
2011-07-01 16:11:15 -07:00
2012-11-09 17:05:07 -08:00
2011-11-01 09:19:49 +01:00
2011-02-04 14:28:58 -08:00
2012-09-28 11:34:33 +09:00
2011-01-18 06:33:54 +01:00
2010-05-11 18:33:37 +02:00
2013-04-18 20:27:55 +02:00
2013-04-05 20:58:45 +02:00
2012-05-09 20:49:18 -04:00
2010-05-11 18:33:37 +02:00
2010-05-11 18:35:27 +02:00
2012-10-15 13:39:12 +02:00
2012-09-21 12:11:08 +02:00
2011-12-25 02:43:17 +01:00
2010-05-11 18:31:17 +02:00
2013-04-02 01:26:10 +02:00
2013-04-05 20:12:54 +02:00
2012-08-14 21:55:30 -07:00
2010-05-11 18:33:37 +02:00
2010-05-11 18:33:37 +02:00
2010-05-11 18:33:37 +02:00
2011-10-31 19:30:28 -04:00
2011-07-29 16:24:46 +02:00
2013-02-27 19:10:24 -08:00
2010-05-11 18:33:37 +02:00
2013-02-26 20:16:07 -08:00
2012-09-21 12:12:05 +02:00
2010-02-10 17:50:47 +01:00
2010-06-09 14:47:40 +02:00
2010-10-21 10:12:48 +11:00
2012-09-22 22:44:34 +02:00
2012-09-03 13:31:39 +02:00
2010-06-08 16:09:52 +02:00
2011-10-31 19:30:28 -04:00
2010-05-11 18:33:37 +02:00
2010-05-11 18:35:27 +02:00
2013-04-18 20:27:55 +02:00
2011-12-16 15:49:52 -05:00
2010-05-11 18:35:27 +02:00
2012-10-17 11:00:31 +02:00
2012-09-24 14:29:01 +02:00
2012-07-10 23:13:45 -07:00
2010-05-11 18:31:17 +02:00
2010-05-11 18:33:37 +02:00
6e0895c2ea