David S. Miller 06c54055be
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...
Conflicts:
drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
net/bridge/br_multicast.c
net/ipv6/sit.c
The conflicts were minor:
1) sit.c changes overlap with change to ip_tunnel_xmit() signature.
2) br_multicast.c had an overlap between computing max_delay using
msecs_to_jiffies and turning MLDV2_MRC() into an inline function
with a name using lowercase instead of uppercase letters.
3) stmmac had two overlapping changes, one which conditionally allocated
and hooked up a dma_cfg based upon the presence of the pbl OF property,
and another one handling store-and-forward DMA made. The latter of
which should not go into the new of_find_property() basic block.
Signed-off-by: David S. Miller <davem@davemloft.net >
2013-09-05 14:58:52 -04:00
2013-07-30 15:54:28 -07:00
2013-08-21 16:47:13 +02:00
2013-04-23 13:25:51 -04:00
2013-08-02 12:33:54 -07:00
2013-04-08 17:16:57 -04:00
2013-08-28 00:27:54 +02:00
2013-08-09 13:09:41 -07:00
2013-08-14 01:12:58 +02:00
2012-06-17 16:29:38 -07:00
2013-08-29 14:55:54 -04:00
2013-07-31 17:24:22 -07:00
2013-08-31 22:30:01 -04:00
2013-07-31 17:50:01 -07:00
2013-08-10 01:16:44 -07:00
2013-07-27 22:14:06 -07:00
2013-07-31 17:50:02 -07:00
2013-07-31 17:50:02 -07:00
2013-08-28 17:45:48 -04:00
2013-08-29 14:08:24 -04:00
2013-07-31 17:50:02 -07:00
2012-06-01 14:18:29 -04:00
2013-07-31 17:50:02 -07:00
2012-08-10 16:52:54 -07:00
2013-03-22 10:31:16 -04:00
2013-01-28 00:15:27 -05:00
2013-01-09 23:59:53 -08:00
2012-07-19 10:43:03 -07:00
2013-09-04 00:27:26 -04:00
2013-08-03 11:53:54 -07:00
2013-03-26 12:32:13 -04:00
2013-03-20 12:14:36 -04:00
2012-10-08 17:42:36 -04:00
2013-06-11 02:51:03 -07:00
2013-08-28 17:19:17 -04:00
2013-07-03 14:37:39 -07:00
2013-01-27 22:46:33 -05:00
2013-02-22 15:10:18 -05:00
2013-07-16 09:58:05 +03:00
2013-04-08 12:00:16 -04:00
2013-09-04 14:53:20 -04:00
2012-07-16 03:44:56 -07:00
2013-02-21 18:15:58 -05:00
2012-07-19 11:02:03 -07:00
2013-03-12 08:30:34 -04:00
2013-05-28 23:49:07 -07:00
2013-05-06 11:06:51 -04:00
2013-02-27 19:10:24 -08:00
2013-06-12 03:13:50 -07:00
2013-02-27 19:10:24 -08:00
2012-07-10 22:40:14 -07:00
2013-01-08 17:56:10 -08:00
2013-08-01 14:16:20 -07:00
2013-08-31 22:29:59 -04:00
2013-09-04 00:27:25 -04:00
2013-07-02 00:33:52 -07:00
2013-09-04 00:27:25 -04:00
2013-06-26 18:01:46 +09:00
2013-09-02 21:00:50 -07:00
2013-08-31 22:29:59 -04:00
2012-05-17 18:45:20 -04:00
2013-04-29 15:41:56 -04:00
2013-09-03 22:34:47 -04:00
2012-09-17 13:13:24 -04:00
2013-08-29 14:08:24 -04:00
2012-06-26 21:06:11 -07:00
2013-09-04 14:53:20 -04:00
2013-02-10 20:37:22 -05:00
2013-08-31 22:30:01 -04:00
2013-07-31 17:50:02 -07:00
2013-07-31 14:56:36 -07:00
2013-01-14 15:04:59 -05:00
2012-09-17 18:08:54 -07:00
2012-09-10 15:30:41 -04:00
2013-07-31 17:50:02 -07:00
2013-02-27 19:10:24 -08:00
2013-06-05 16:37:30 -07:00
2013-07-31 17:24:22 -07:00
2013-08-31 00:32:32 -04:00
2012-11-15 17:39:51 -05:00
2012-05-19 01:08:16 -04:00
2013-01-03 13:01:30 +01:00
2013-04-22 15:55:48 -04:00
2013-08-14 13:09:07 +02:00
2013-03-22 10:31:16 -04:00
2013-08-31 18:09:45 -04:00
2013-04-22 20:32:51 -04:00
2013-04-29 15:14:02 -04:00
2012-08-06 13:40:47 -07:00
2013-08-29 15:50:06 -04:00
2013-09-04 00:27:28 -04:00
2012-06-09 14:56:12 -07:00
2013-06-04 16:43:42 -07:00
2013-07-27 22:16:36 -07:00
2013-07-27 22:14:06 -07:00
2013-09-05 12:44:30 -04:00
2013-09-05 14:58:52 -04:00
06c54055be