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
..
core	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2012-06-28 17:37:00 -07:00
hw	RDMA/ocrdma: Fix off by one in ocrdma_query_gid()	2012-06-14 13:30:41 -07:00
ulp	InfiniBand/RDMA changes for the 3.5 merge window:	2012-05-21 17:54:55 -07:00
Kconfig	RDMA/ocrdma: Add driver for Emulex OneConnect IBoE RDMA adapter	2012-05-08 11:17:47 -07:00
Makefile	RDMA/ocrdma: Add driver for Emulex OneConnect IBoE RDMA adapter	2012-05-08 11:17:47 -07:00