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
..
boot	sparc: Fix piggyback with newer binutils.	2012-12-03 11:24:25 -08:00
configs
crypto	sparc64: Set CRYPTO_TFM_REQ_MAY_SLEEP consistently in CAMELLIA code.	2012-12-19 15:44:31 -08:00
include	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-05-24 00:32:30 -04:00
kernel	sparc64: fix format string mismatch in arch/sparc/kernel/sysfs.c	2014-05-21 12:54:42 -07:00
lib	sparc64: Add membar to Niagara2 memcpy code.	2014-05-17 11:28:05 -07:00
math-emu	sparc64: Make montmul/montsqr/mpmul usable in 32-bit threads.	2012-10-26 15:18:37 -07:00
mm	sparc64: Fix huge TSB mapping on pre-UltraSPARC-III cpus.	2014-05-08 14:59:07 -07:00
net	net: filter: add jited flag to indicate jit compiled filters	2014-03-31 00:45:08 -04:00
oprofile
power	sparc64: Hibernation support	2013-03-20 11:06:54 -07:00
prom	sparc: delete non-required instances of include <linux/init.h>	2014-01-28 23:38:23 -08:00
Kbuild	sparc64: Add SHA1 driver making use of the 'sha1' instruction.	2012-08-20 15:08:49 -07:00
Kconfig	Merge git://git.infradead.org/users/eparis/audit	2014-04-12 12:38:53 -07:00
Kconfig.debug
Makefile	sparc64: Hibernation support	2013-03-20 11:06:54 -07:00