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
..
e1000	e1000: Combining Bitwise OR in one expression.	2012-06-20 01:08:44 -07:00
e1000e	e1000e: use more informative logging macros when netdev not yet registered	2012-06-14 03:03:14 -07:00
igb	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2012-06-25 15:50:32 -07:00
igbvf	igbvf: fix the bug when initializing the igbvf	2012-04-30 18:54:31 -07:00
ixgb	intel: make wired ethernet driver message level consistent (rev2)	2012-03-27 23:29:22 -07:00
ixgbe	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2012-06-28 17:37:00 -07:00
ixgbevf	ixgbevf: Update version string	2012-05-03 02:38:38 -07:00
e100.c	e100: enable transmit time stamping.	2012-04-14 02:02:41 -07:00
Kconfig	Kconfig: Fix Kconfig for Intel ixgbe and igb PTP support.	2012-06-20 00:52:54 -07:00
Makefile