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
1c385f1fdf ("caif-hsi: Replace platform
device with ops structure.") in the net-next tree and commit
39abbaef19 ("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-19 21:40:14 +02:00
2012-06-20 14:41:57 -07:00
2012-06-01 16:55:42 -07:00
2012-06-16 15:23:35 -07:00
2012-06-07 14:58:38 +02:00
2012-05-31 18:18:11 -07:00
2012-06-28 17:37:00 -07:00
2012-06-06 15:20:22 -04:00
2012-06-28 17:37:00 -07:00
2012-06-19 21:39:50 +02:00
2012-06-03 20:05:57 -07:00
2012-05-31 17:49:32 -07:00
2012-06-18 09:47:00 -04:00
2012-05-31 17:49:31 -07:00
2012-06-01 12:12:01 -04:00
2012-06-27 15:42:24 -07:00
2012-05-31 17:49:32 -07:00
2012-06-01 16:57:51 -07:00
2012-06-03 14:50:19 -07:00
2012-06-04 16:49:43 +02:00
2012-06-19 21:39:50 +02:00
2012-06-26 21:09:39 -07:00
2012-06-12 15:25:46 -07:00
2012-05-31 17:49:31 -07:00
2012-05-31 17:49:32 -07:00
2012-06-18 15:55:21 -07:00
2012-06-04 11:43:00 -04:00
2012-06-20 14:39:35 -07:00
2012-06-01 10:34:35 -07:00
2012-06-08 14:58:13 +09:30
2012-06-12 18:51:09 -07:00
2012-06-16 15:40:02 +02:00
2012-06-16 15:40:02 +02:00
2012-06-22 02:49:52 +02:00
2012-06-26 21:54:15 -07:00
2012-06-04 21:34:30 +02:00
2012-06-18 08:45:16 -04:00
2012-06-05 18:38:47 -04:00
2012-06-06 15:20:22 -04:00
2012-06-26 21:06:11 -07:00
2012-06-20 14:39:36 -07:00
2012-06-13 13:11:39 -07:00
2012-06-06 17:08:00 +02:00
2012-06-27 21:23:25 -07:00
2012-06-07 14:43:55 -07:00
2012-06-13 16:52:40 -07:00
2012-06-11 12:26:15 +08:00
2012-06-05 10:46:40 -07:00
2012-06-06 20:43:28 -07:00
2012-06-06 20:43:28 -07:00
2012-05-31 17:49:31 -07:00
2012-05-31 17:49:31 -07:00
2012-06-27 15:36:44 -07:00
2012-06-08 14:59:29 -07:00
2012-06-01 10:37:01 -04:00
2012-06-01 12:58:52 -04:00
2012-06-15 15:30:15 -07:00
2012-06-04 11:27:40 -04:00
2012-06-04 12:28:45 -07:00
2012-06-15 21:48:14 -07:00
2012-05-31 17:49:32 -07:00
2012-06-22 23:02:22 -07:00
2012-06-12 21:59:18 -07:00
2012-06-01 12:58:50 -04:00
2012-06-02 15:21:43 -07:00
2012-06-21 09:32:16 +01:00
2012-06-11 15:47:21 -03:00