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-04-23 13:25:51 -04:00
2013-08-29 22:58:24 +02:00
2013-04-08 06:53:15 -03:00
2013-08-28 00:27:54 +02:00
2013-08-02 12:33:54 -07:00
2013-08-02 12:33:54 -07:00
2013-04-02 12:25:57 +02:00
2013-03-13 15:21:49 -07:00
2013-07-16 15:33:02 -07:00
2013-08-02 12:33:54 -07:00
2013-03-13 15:21:48 -07:00
2013-03-13 15:21:48 -07:00
2013-05-07 22:27:15 -04:00
2013-04-26 16:08:16 +10:00
2013-07-01 15:10:53 +02:00
2013-06-14 11:29:53 -04:00
2013-08-28 19:26:38 -07:00
2013-03-20 13:23:21 -04:00
2013-03-15 12:12:36 -07:00
2013-06-25 15:50:04 -07:00
2013-07-10 23:41:18 +01:00
2013-08-02 12:33:54 -07:00
2013-03-27 14:37:47 +00:00
2013-05-27 22:42:50 -07:00
2013-08-03 10:40:23 -07:00
2013-03-20 13:15:45 -04:00
2013-07-27 20:24:36 +02:00
2013-04-29 15:54:33 -07:00
2013-05-01 14:37:21 +02:00
2013-06-11 02:51:03 -07:00
2013-09-03 22:11:44 -04:00
2013-06-24 16:39:05 -07:00
2013-08-02 12:33:54 -07:00
2013-05-08 13:13:30 -07:00
2013-03-28 01:20:42 -04:00
2013-08-31 22:30:00 -04:00
2013-08-29 16:43:29 -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-27 11:54:51 +02:00
2013-06-26 18:01:46 +09:00
2013-08-26 16:37:08 -04:00
2013-08-29 15:32:08 -04:00
2013-09-04 13:12:43 -04:00
2013-07-03 10:31:38 -07:00
2013-09-04 13:12:43 -04:00
2013-05-04 15:48:44 -04:00
2013-03-21 14:05:31 -03:00
2013-07-09 10:33:25 -07:00
2013-03-17 12:23:46 -04:00
2013-04-19 14:57:58 -04:00
2013-04-19 14:57:57 -04:00
2013-08-14 01:12:58 +02:00
2013-08-23 16:06:03 +02:00
2013-08-26 14:03:13 -07:00
2013-04-29 13:21:30 -04:00
2013-05-29 14:46:24 -06:00
2013-06-19 14:43:35 +02:00
2013-08-29 21:38:31 -04:00
2013-07-03 16:08:01 -07:00
2013-04-12 16:54:38 +02:00
2013-06-19 23:06:51 -07:00
2013-07-24 17:53:38 -07:00
2013-07-02 14:42:51 -07:00
2013-08-16 15:37:26 -07:00
2013-07-24 17:54:48 -07:00
2013-03-22 16:19:59 -07:00
2013-06-17 15:53:00 -07:00
2013-06-17 15:53:00 -07:00
2013-03-21 12:36:33 -04:00
2013-06-28 15:07:16 -03:00
2013-04-14 19:56:36 -03:00
2013-04-04 19:40:08 -03:00
2013-07-10 14:50:08 -07:00
2013-05-02 13:40:15 +03:00
2013-06-21 10:46:44 -03:00
2013-04-02 16:42:58 +10:30
2013-07-09 10:47:45 +09:30
2013-07-03 13:09:06 -07:00
2013-03-20 14:06:06 +10:30
2013-08-02 12:33:54 -07:00
2013-05-20 12:08:09 +09:30
2013-03-08 12:24:48 -05:00
2013-03-06 07:02:45 +01:00
06c54055be