David S. Miller
b26d344c6b
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...
Conflicts:
drivers/net/caif/caif_hsi.c
drivers/net/usb/qmi_wwan.c
The qmi_wwan merge was trivial.
The caif_hsi.c, on the other hand, was not. It's a conflict between
1c385f1fdf6f9c66d982802cd74349c040980b50 ("caif-hsi: Replace platform
device with ops structure.") in the net-next tree and commit
39abbaef19cd0a30be93794aa4773c779c3eb1f3 ("caif-hsi: Postpone init of
HIS until open()") in the net tree.
I did my best with that one and will ask Sjur to check it out.
Signed-off-by: David S. Miller <davem@davemloft.net>
2012-06-28 17:37:00 -07:00
2012-06-04 21:15:31 -07:00
2011-06-15 21:52:50 -07:00
2012-03-30 03:30:19 -04:00
2012-03-30 16:03:15 -07:00
2012-06-20 14:39:36 -07:00
2009-09-24 07:20:57 -07:00
2012-03-23 16:58:33 -07:00
2012-04-16 14:37:13 +02:00
2011-11-04 12:01:48 -07:00
2012-03-30 16:03:15 -07:00
2011-09-27 18:08:04 +02:00
2012-05-29 16:22:27 -07:00
2012-06-26 21:19:02 -07:00
2010-02-24 13:51:32 +01:00
2011-11-08 10:23:29 +01:00
2012-03-30 01:52:58 -04:00
2012-04-03 13:09:18 +02:00
2009-08-29 19:09:27 -07:00
2011-12-12 14:14:31 -08:00
2012-06-03 00:30:01 +01:00
2012-06-27 21:23:25 -07:00
2012-06-25 14:53:09 -07:00
2012-05-21 16:58:23 -07:00
2012-05-24 10:21:51 -07:00
2012-03-20 10:09:28 +00:00
2012-04-20 09:24:27 -07:00
2011-10-26 16:32:13 -04:00
2012-03-30 16:03:15 -07:00
2012-06-01 10:34:35 -07:00
2010-08-05 13:53:34 -07:00
2011-09-27 18:08:04 +02:00
2011-03-22 11:43:51 +01:00
2012-06-17 18:05:06 +02:00
2012-05-30 10:55:34 +02:00
2012-03-07 16:08:24 +01:00
2011-03-31 11:26:23 -03:00
2012-03-30 16:03:15 -07:00
2010-08-04 15:21:40 +02:00
2012-03-30 16:03:15 -07:00
2012-05-09 14:00:31 -07:00
2012-03-30 16:03:15 -07:00
2011-07-25 23:06:24 -07:00
2012-05-28 10:37:56 -07:00
2011-12-27 11:27:13 +01:00
2012-02-15 14:48:01 -08:00
2012-03-30 16:03:15 -07:00
2012-05-29 16:22:32 -07:00
2011-08-03 14:25:21 -10:00
2010-12-14 22:16:19 +01:00
2012-05-02 00:10:49 -07:00
2011-03-31 11:26:23 -03:00
2012-05-14 15:43:44 -07:00
2012-01-11 23:58:43 -05:00
2009-06-12 18:01:47 +02:00
2010-08-04 15:21:40 +02:00
2010-04-23 02:09:52 +02:00
2012-06-25 16:44:12 -07:00
2012-05-15 17:28:01 -04:00
2012-04-16 14:37:13 +02:00
2011-09-27 18:08:04 +02:00
2010-09-29 17:20:24 +02:00
2012-05-31 12:10:15 -07:00
2012-05-22 14:37:24 +10:00
2011-01-13 08:03:21 -08:00
2012-04-14 11:13:22 +10:00
2011-05-13 16:31:00 -07:00
2011-05-23 13:01:00 -07:00
2011-11-02 16:07:02 -07:00
2012-04-30 10:48:18 -07:00
2012-03-30 16:03:15 -07:00
2012-05-17 13:48:56 +02:00
2012-05-23 17:12:06 -07:00
2012-05-14 22:48:38 -07:00
2012-05-17 19:02:14 -04:00
2010-11-15 18:25:12 +09:00
2012-05-23 13:05:43 -07:00
2012-03-07 19:19:48 -07:00
2012-05-31 17:49:31 -07:00
2012-02-10 09:52:18 +01:00
2011-03-31 11:26:23 -03:00
2012-01-23 03:15:25 -05:00
2011-09-27 18:08:04 +02:00
2012-05-08 14:17:25 +02:00
2012-05-22 19:22:50 -07:00
2011-07-14 17:57:09 -07:00
2012-05-24 10:21:51 -07:00
2012-05-24 16:17:30 -07:00
2012-06-04 12:28:45 -07:00
2011-03-31 11:26:23 -03:00
2012-05-30 07:56:12 +02:00
2009-01-07 10:00:18 -08:00
2012-06-01 09:11:41 -07:00
2012-05-07 17:20:27 -07:00
2010-04-08 11:34:34 +02:00
2012-05-17 19:06:13 -04:00
2011-12-11 10:31:58 -08:00
2010-08-04 15:21:40 +02:00
2009-06-12 18:01:47 +02:00
2009-08-22 14:25:32 -07:00
2011-09-27 18:08:04 +02:00
2011-05-25 08:39:21 -07:00
2011-07-11 16:48:38 -07:00
2010-03-24 16:31:22 -07:00
2012-03-16 20:35:01 +00:00
2012-01-14 22:25:56 +01:00
2012-05-31 17:49:26 -07:00
2012-03-29 15:38:31 +10:30
2010-09-09 20:41:25 +02:00
2012-03-23 16:58:37 -07:00
2009-10-03 09:28:11 +02:00
2011-03-31 11:26:23 -03:00
2012-05-23 17:12:06 -07:00
2011-11-09 12:10:37 +02:00
2011-07-26 16:49:45 -07:00
2011-11-02 16:07:02 -07:00
2012-03-28 16:36:44 +02:00
2012-05-25 12:51:11 +05:30
2012-03-07 16:08:24 +01:00
2012-03-30 16:03:15 -07:00
2012-04-30 16:26:30 -04:00
2012-04-16 14:37:13 +02:00
2012-05-17 19:06:13 -04:00
2011-08-13 18:34:03 -07:00
2012-06-12 14:25:04 -04:00
2011-04-28 16:12:47 -04:00
2009-05-09 07:12:50 +02:00
2009-09-21 15:14:56 +02:00
2012-04-05 21:24:06 -07:00
2012-04-19 19:13:08 -07:00
2011-09-21 19:45:34 +03:00
2010-03-06 11:26:29 -08:00
2012-05-25 16:18:34 +02:00
2010-08-04 15:21:40 +02:00
2009-09-19 09:37:23 -07:00
2011-03-23 20:44:18 +01:00
2010-12-14 00:22:00 -05:00
2011-05-25 08:39:45 -07:00
2012-02-14 14:06:47 -07:00
2011-03-31 11:26:23 -03:00
2010-09-11 16:49:21 -07:00
2011-09-27 18:08:04 +02:00
2012-06-04 11:25:31 -07:00
2009-07-01 22:36:22 +02:00
2011-12-02 16:12:42 +00:00
2012-02-15 14:48:01 -08:00
2010-11-01 15:38:34 -04:00
2011-03-07 13:20:05 -08:00
2010-08-04 15:21:40 +02:00
2009-06-12 18:01:47 +02:00
2011-12-11 10:31:23 -08:00
2011-05-28 17:03:29 +02:00
2012-02-11 15:11:28 +01:00
2009-04-27 12:00:27 -07:00
2009-04-27 12:00:27 -07:00
2012-01-30 12:54:40 -05:00
2012-05-09 13:59:09 -07:00
2011-12-23 10:17:51 +11:00
2012-05-14 08:44:11 -03:00
2011-09-27 18:08:04 +02:00
2012-04-16 14:37:13 +02:00
2009-09-22 07:17:26 -07:00
2012-03-30 16:03:15 -07:00
2010-09-03 08:19:51 +02:00
2009-12-15 08:53:24 -08:00
2012-02-28 16:05:06 +01:00
2011-11-07 07:54:42 +10:30
2010-08-11 08:59:18 -07:00
2012-03-30 16:03:15 -07:00
2012-04-18 13:53:13 +02:00
2010-02-05 12:22:44 +01:00
2011-06-15 21:52:50 -07:00
2012-05-17 08:51:59 -07:00
2011-07-24 10:03:05 -07:00
2012-03-06 19:14:12 +02:00
2011-09-27 18:08:04 +02:00
2009-06-18 13:03:56 -07:00
2012-02-08 22:53:58 +02:00
2010-06-05 17:39:09 +02:00
2011-03-09 11:25:10 -08:00
2011-03-31 11:26:23 -03:00
2009-06-12 18:01:47 +02:00
2010-07-19 10:56:54 +02:00
2011-07-11 12:45:04 -07:00
2011-03-30 12:02:05 +02:00
2012-01-24 10:50:22 -08:00
2012-04-16 14:37:13 +02:00
2011-07-25 20:57:17 -07:00
2011-08-13 18:34:03 -07:00
2012-05-25 16:18:30 +02:00
2010-03-16 11:47:56 +01:00
2012-03-30 16:03:15 -07:00
2012-01-02 13:04:55 +01:00
2012-05-08 16:01:34 -07:00
2010-03-24 16:31:20 -07:00
2011-03-31 13:40:42 +02:00
2011-01-13 08:03:24 -08:00
b26d344c6b
