David S. Miller c85d6975ef Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/ethernet/mellanox/mlx4/cmd.c net/core/fib_rules.c net/ipv4/fib_frontend.c The fib_rules.c and fib_frontend.c conflicts were locking adjustments in 'net' overlapping addition and removal of code in 'net-next'. The mlx4 conflict was a bug fix in 'net' happening in the same place a constant was being replaced with a more suitable macro. Signed-off-by: David S. Miller <davem@davemloft.net>		2015-04-06 22:34:15 -04:00
..
boot
configs
crypto
include	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-04-06 22:34:15 -04:00
kernel	powerpc/book3s: Fix the MCE code to use CONFIG_KVM_BOOK3S_64_HANDLER	2015-03-23 17:10:47 +11:00
kvm	KVM: PPC: Book3S HV: Fix instruction emulation	2015-03-20 11:42:33 +01:00
lib
math-emu
mm
net
oprofile
perf
platforms	powerpc/pseries: Little endian fixes for post mobility device tree update	2015-03-20 14:53:01 +11:00
sysdev
xmon
Kconfig
Kconfig.debug
Makefile
relocs_check.pl