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
..
acpi	IOMMU Upates for Linux v3.15	2014-04-05 18:46:26 -07:00
asm-generic	asm-generic: remove _STK_LIM_MAX	2014-05-15 00:32:09 +01:00
clocksource
crypto
drm	Merge branch 'mullins' of git://people.freedesktop.org/~deathsimple/linux into drm-fixes	2014-05-07 09:10:28 +10:00
dt-bindings	3.15 fixes for AT91	2014-04-26 11:29:30 +02:00
keys
kvm
linux	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-05-24 00:32:30 -04:00
math-emu
media	[media] rc-core: remove generic scancode filter	2014-04-06 11:30:29 -03:00
memory
misc
net	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-05-24 00:32:30 -04:00
pcmcia
ras
rdma
rxrpc
scsi	scsi: Make sure cmd_flags are 64-bit	2014-04-09 20:26:20 -06:00
sound
target	target/sbc: Add sbc_dif_read_strip software emulation	2014-04-07 01:48:57 -07:00
trace	This contains two fixes.	2014-05-08 14:17:13 -07:00
uapi	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-05-24 00:32:30 -04:00
video	fbdev changes for 3.15 (OMAP)	2014-04-07 10:47:51 -07:00
xen
Kbuild