David S. Miller 143c905494 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/ethernet/intel/i40e/i40e_main.c drivers/net/macvtap.c Both minor merge hassles, simple overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net>		2013-12-18 16:42:06 -05:00
..
block	s390/dasd: fix memory leak caused by dangling references to request_queue	2013-12-02 15:31:06 +01:00
char	s390/sclp: replace uninitialized early_event_mask_sccb variable with sccb_early	2013-12-02 15:31:07 +01:00
cio	s390/scm_block: do not hide eadm subchannel dependency	2013-11-15 14:08:42 +01:00
crypto	s390/s390dbf: use debug_level_enabled() where applicable	2013-10-24 17:16:54 +02:00
kvm	virtio_ring: change host notification API	2013-10-29 11:28:11 +10:30
net	qeth: Accurate ethtool output	2013-12-17 17:17:13 -05:00
scsi	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2013-11-15 16:47:22 -08:00
Makefile	[S390] split/move machine check handler code	2009-03-26 15:24:10 +01:00