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
..
alpha	lib: Add missing arch generic-y entries for asm-generic/hash.h	2013-12-17 21:26:19 -05:00
arc	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-01-06 17:37:45 -05:00
arm	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-01-06 17:37:45 -05:00
arm64	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-01-06 17:37:45 -05:00
avr32	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2013-12-18 16:42:06 -05:00
blackfin	lib: Add missing arch generic-y entries for asm-generic/hash.h	2013-12-17 21:26:19 -05:00
c6x	lib: Add missing arch generic-y entries for asm-generic/hash.h	2013-12-17 21:26:19 -05:00
cris	lib: Add missing arch generic-y entries for asm-generic/hash.h	2013-12-17 21:26:19 -05:00
frv	lib: Add missing arch generic-y entries for asm-generic/hash.h	2013-12-17 21:26:19 -05:00
hexagon	lib: Add missing arch generic-y entries for asm-generic/hash.h	2013-12-17 21:26:19 -05:00
ia64	lib: Add missing arch generic-y entries for asm-generic/hash.h	2013-12-17 21:26:19 -05:00
m32r	lib: Add missing arch generic-y entries for asm-generic/hash.h	2013-12-17 21:26:19 -05:00
m68k	lib: Add missing arch generic-y entries for asm-generic/hash.h	2013-12-17 21:26:19 -05:00
metag	lib: Add missing arch generic-y entries for asm-generic/hash.h	2013-12-17 21:26:19 -05:00
microblaze	lib: Add missing arch generic-y entries for asm-generic/hash.h	2013-12-17 21:26:19 -05:00
mips	b44: use fixed PHY device if we do not find any	2013-12-20 20:48:49 -05:00
mn10300	lib: Add missing arch generic-y entries for asm-generic/hash.h	2013-12-17 21:26:19 -05:00
openrisc	lib: Add missing arch generic-y entries for asm-generic/hash.h	2013-12-17 21:26:19 -05:00
parisc	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2013-12-18 16:42:06 -05:00
powerpc	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-01-06 17:37:45 -05:00
s390	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2013-12-18 16:42:06 -05:00
score	lib: Add missing arch generic-y entries for asm-generic/hash.h	2013-12-17 21:26:19 -05:00
sh	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-01-06 17:37:45 -05:00
sparc	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-01-06 17:37:45 -05:00
tile	lib: Add missing arch generic-y entries for asm-generic/hash.h	2013-12-17 21:26:19 -05:00
um	lib: Add missing arch generic-y entries for asm-generic/hash.h	2013-12-17 21:26:19 -05:00
unicore32	lib: Add missing arch generic-y entries for asm-generic/hash.h	2013-12-17 21:26:19 -05:00
x86	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-01-06 17:37:45 -05:00
xtensa	lib: Add missing arch generic-y entries for asm-generic/hash.h	2013-12-17 21:26:19 -05:00
.gitignore
Kconfig	kernel: remove CONFIG_USE_GENERIC_SMP_HELPERS	2013-11-15 09:32:22 +09:00