David S. Miller 54e5c4def0 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/bonding/bond_alb.c drivers/net/ethernet/altera/altera_msgdma.c drivers/net/ethernet/altera/altera_sgdma.c net/ipv6/xfrm6_output.c Several cases of overlapping changes. The xfrm6_output.c has a bug fix which overlaps the renaming of skb->local_df to skb->ignore_df. In the Altera TSE driver cases, the register access cleanups in net-next overlapped with bug fixes done in net. Similarly a bug fix to send ALB packets in the bonding driver using the right source address overlaps with cleanups in net-next. Signed-off-by: David S. Miller <davem@davemloft.net>		2014-05-24 00:32:30 -04:00
..
asm-generic	asm-generic: Add renameat2 syscall	2014-05-20 10:59:38 +02:00
drm	drm/tegra: Remove gratuitous pad field	2014-04-16 17:11:04 +02:00
linux	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-05-24 00:32:30 -04:00
mtd	UBI: make UBI_IOCVOLCRBLK take a parameter for future usage	2014-03-06 12:04:22 +02:00
rdma	IB/core: Re-enable create_flow/destroy_flow uverbs	2013-11-17 08:22:09 -08:00
scsi
sound	ALSA: compress: add num_sample_rates in snd_codec_desc	2014-01-07 18:33:40 +01:00
video
xen	xen: install xen/gntdev.h and xen/gntalloc.h	2014-02-11 10:12:36 -05:00
Kbuild