David S. Miller 56a4342dfe Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/ethernet/qlogic/qlcnic/qlcnic_sriov_pf.c net/ipv6/ip6_tunnel.c net/ipv6/ip6_vti.c ipv6 tunnel statistic bug fixes conflicting with consolidation into generic sw per-cpu net stats. qlogic conflict between queue counting bug fix and the addition of multiple MAC address support. Signed-off-by: David S. Miller <davem@davemloft.net>		2014-01-06 17:37:45 -05:00
..
boot	powerpc/512x: dts: disable MPC5125 usb module	2013-12-20 22:12:07 +01:00
configs	powerpc/52xx: Re-enable bestcomm driver in defconfigs	2013-12-10 11:25:08 +11:00
crypto
include	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-01-06 17:37:45 -05:00
kernel	Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc	2013-12-30 10:22:57 -08:00
kvm	KVM: PPC: Book3S HV: Don't drop low-order page address bits	2013-12-18 11:30:35 +01:00
lib	powerpc: Make 64-bit non-VMX __copy_tofrom_user bi-endian	2013-12-30 14:02:30 +11:00
math-emu	powerpc/math-emu: Fix load/store indexed emulation	2013-08-14 14:59:57 +10:00
mm	powerpc/booke: Only check for hugetlb in flush if vma != NULL	2013-11-22 16:57:29 -06:00
net	Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc	2013-11-12 14:34:19 +09:00
oprofile	Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc	2013-09-06 10:49:42 -07:00
perf	powerpc/perf: Fix handling of FAB events	2013-10-03 17:25:38 +10:00
platforms	powernv/eeh: Add buffer for P7IOC hub error data	2013-12-30 14:02:32 +11:00
sysdev	powerpc/44x: Fix ocm_block allocation	2013-12-10 11:25:04 +11:00
xmon	powerpc/xmon: Fix printing of set of CPUs in xmon	2013-09-05 17:29:19 +10:00
Kconfig	Kconfig cleanups for v3.13	2013-11-15 14:05:15 -08:00
Kconfig.debug	Merge branch 'kconfig-diet' from Dave Hansen	2013-07-04 11:25:51 -07:00
Makefile	powerpc: Fix error when cross building TAGS & cscope	2013-11-25 11:49:11 +11:00
relocs_check.pl	Fix warning typo "CONFIG_RELCOATABLE"	2013-05-29 15:11:30 +02:00