David S. Miller 86feff3f3e
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jesse/openvswitch ...
Conflicts:
net/openvswitch/vport-internal_dev.c
Jesse Gross says:
====================
A couple of minor enhancements for net-next/3.10. The largest is an
extension to allow variable length metadata to be passed to userspace
with packets.
There is a merge conflict in net/openvswitch/vport-internal_dev.c:
A existing commit modifies internal_dev_mac_addr() and a new commit
deletes it. The new one is correct, so you can just remove that function.
====================
Signed-off-by: David S. Miller <davem@davemloft.net >
2013-03-17 12:58:47 -04:00
2013-02-26 09:24:48 -08:00
2013-03-02 16:33:54 -08:00
2013-02-26 15:03:06 -08:00
2013-02-21 15:27:22 -08:00
2013-02-13 08:35:43 -08:00
2013-03-01 13:39:00 -08:00
2013-03-08 16:03:29 -08:00
2013-02-09 15:22:14 +00:00
2013-02-20 11:00:43 -08:00
2013-03-03 12:06:09 -08:00
2013-02-28 18:02:55 -08:00
2013-02-27 19:10:09 -08:00
2013-02-26 11:41:08 -08:00
2013-02-24 14:37:22 -05:00
2013-02-22 09:22:19 +02:00
2013-02-26 17:24:26 -05:00
2013-02-13 06:16:08 -08:00
2013-02-15 09:52:29 +01:00
2013-03-13 04:38:19 -04:00
2013-02-16 13:34:10 -08:00
2013-03-01 06:07:22 +00:00
2013-02-22 09:20:11 -08:00
2013-02-21 12:11:44 -08:00
2013-02-08 13:16:17 -05:00
2013-03-02 16:46:07 -08:00
2013-02-21 15:27:22 -08:00
2013-03-02 09:34:39 -08:00
2013-02-21 17:22:19 -08:00
2013-03-01 12:47:16 +01:00
2013-02-26 02:46:13 -05:00
2013-02-15 18:52:45 -08:00
2013-02-23 17:50:12 -08:00
2013-02-20 09:37:28 -05:00
2013-02-21 17:22:16 -08:00
2013-02-13 06:00:53 -08:00
2013-02-23 17:50:10 -08:00
2013-02-25 09:24:55 -05:00
2013-02-21 17:22:15 -08:00
2013-02-21 17:22:15 -08:00
2013-02-21 17:22:15 -08:00
2013-02-21 17:22:16 -08:00
2013-02-15 16:45:06 +01:00
2013-02-25 16:46:44 -08:00
2013-02-11 18:49:51 -05:00
2013-02-26 02:46:09 -05:00
2013-02-27 19:10:11 -08:00
2013-03-01 22:45:49 +00:00
2013-02-21 12:05:51 -08:00
2013-03-01 22:45:49 +00:00
2013-02-27 15:13:36 +05:30
2013-02-27 22:37:34 +05:30
2013-02-28 09:53:21 +05:30
2013-03-03 23:59:59 -08:00
2013-02-21 14:16:27 -03:00
2013-02-21 09:38:18 -08:00
2013-02-28 12:52:24 -08:00
2013-02-26 02:46:08 -05:00
2013-02-27 19:10:23 -08:00
2013-02-23 17:50:12 -08:00
2013-02-27 19:10:11 -08:00
2013-03-01 23:51:07 -05:00
2013-03-03 19:36:31 -08:00
2013-02-22 23:31:31 -05:00
2013-02-26 03:10:52 +11:00
2013-02-22 00:05:07 +01:00
2013-02-27 19:10:24 -08:00
2013-02-22 08:20:05 +01:00
2013-02-21 10:45:01 +01:00
2013-02-23 17:50:16 -08:00
2013-02-23 17:50:17 -08:00
2013-02-26 20:16:07 -08:00
2013-02-27 19:10:21 -08:00
2013-02-15 09:41:42 +01:00
2013-02-06 15:59:47 -05:00
2013-03-06 14:55:20 -05:00
2013-02-23 21:00:06 -05:00
2013-02-11 14:16:26 -05:00
2013-02-19 08:06:01 +01:00
2013-02-06 10:47:28 +01:00
2013-02-27 19:10:21 -08:00
2013-02-05 00:48:46 +01:00
2013-02-09 16:29:20 -05:00
2013-02-04 15:35:26 -08:00
2013-02-23 17:50:19 -08:00
2013-02-24 13:07:18 -08:00
2013-02-27 19:10:24 -08:00
2013-02-19 15:17:08 -05:00
2013-02-22 19:25:09 -08:00
2013-02-20 19:36:01 +01:00
2013-03-02 09:34:39 -08:00
2013-02-23 17:50:20 -08:00
2013-02-23 17:50:13 -08:00
2013-03-12 06:50:58 -04:00
2013-02-23 17:50:19 -08:00
2013-02-23 17:50:17 -08:00
2013-03-03 12:06:09 -08:00
2013-02-23 17:50:11 -08:00
2013-02-05 20:38:48 +11:00
2013-02-23 17:50:20 -08:00
2013-03-09 16:09:17 -05:00
2013-03-15 08:30:46 -04:00
2013-02-11 19:19:33 -05:00
2013-02-13 06:16:06 -08:00
2013-02-13 06:15:29 -08:00
2013-03-02 16:46:07 -08:00
2013-02-13 10:11:53 +00:00
2013-02-13 10:09:31 +00:00
2013-02-22 16:29:22 -08:00
2013-02-23 00:30:08 +01:00
2013-02-23 17:50:17 -08:00
2013-02-14 15:55:23 +01:00
2013-02-23 17:50:15 -08:00
2013-02-21 17:22:19 -08:00
2013-03-01 23:51:07 -05:00
2013-02-28 20:42:33 -08:00
2013-02-25 21:18:18 -08:00
2013-02-05 11:54:06 +01:00
2013-02-08 18:28:02 +01:00
2013-03-12 11:40:53 -04:00
2013-02-27 19:10:24 -08:00
2013-02-23 17:50:16 -08:00
2013-02-23 17:50:16 -08:00
2013-02-21 12:05:51 -08:00
2013-02-13 09:40:35 -08:00
2013-02-21 17:38:49 -08:00
2013-02-21 13:41:04 -08:00
2013-02-26 09:34:29 -08:00
2013-02-08 13:14:40 +00:00
2013-02-27 19:10:24 -08:00
2013-02-14 17:11:09 +00:00
2013-02-23 17:50:17 -08:00
2013-02-21 12:05:51 -08:00
2013-03-07 15:29:45 -05:00
2013-02-27 19:10:10 -08:00
2013-02-27 19:10:11 -08:00
2013-02-19 08:43:34 +01:00
2013-02-13 10:13:58 -08:00
2013-03-09 16:09:17 -05:00
2013-02-21 17:22:20 -08:00
2013-02-26 22:25:17 +01:00
2013-02-10 19:41:08 -05:00
2013-02-07 15:15:00 -08:00
2013-03-01 12:40:36 +01:00
2013-02-13 12:15:50 -08:00
2013-02-09 22:30:44 +01:00
2013-02-23 17:50:22 -08:00
2013-02-14 09:21:15 -05:00
2013-03-12 08:30:34 -04:00
2013-02-06 13:45:42 +08:00
2013-02-05 00:48:46 +01:00
2013-02-21 14:58:40 -08:00
2013-02-04 15:40:28 -08:00
2013-02-13 10:13:58 -08:00
2013-02-08 18:28:04 +01:00
2013-02-14 00:22:58 +01:00
2013-02-13 17:00:32 +10:30
2013-02-23 17:50:15 -08:00
2013-03-08 12:24:48 -05:00
2013-02-23 17:50:16 -08:00
2013-02-08 12:13:43 +10:00
2013-03-01 12:48:36 +01:00
2013-02-08 10:05:02 +02:00
2013-02-13 19:29:12 -08:00
86feff3f3e