Files
twx-linux/include/linux
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-06 15:20:22 -04:00
2012-06-27 15:42:24 -07:00
2012-05-31 17:49:32 -07:00
2012-06-05 18:38:47 -04:00
2012-06-20 14:39:36 -07:00
2012-06-06 17:08:00 +02: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