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
..
boards	sh: ecovec: fixup compile error on sdhi	2013-09-25 21:28:27 -04:00
boot	Kbuild: centralize MKIMAGE and cmd_uimage definitions	2012-03-26 15:49:20 +02:00
cchips	sh: hd64461: Migrate off of deprecated dynamic IRQ API.	2012-05-18 23:20:09 +09:00
configs	PCI: hotplug: Convert to be builtin only, not modular	2013-07-25 14:11:06 -06:00
drivers	PCI: Delay enabling bridges until they're needed	2013-07-25 12:35:03 -06:00
include	lib: Add missing arch generic-y entries for asm-generic/hash.h	2013-12-17 21:26:19 -05:00
kernel	Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2013-11-19 10:40:00 -08:00
lib	sh: always link in helper functions extracted from libgcc	2013-12-18 19:04:51 -08:00
lib64	sh64: Kill off old exception debugging helpers.	2012-06-14 14:12:18 +09:00
math-emu	Disintegrate asm/system.h for SH	2012-03-28 18:30:03 +01:00
mm	mm: use pgdat_end_pfn() to simplify the code in arch	2013-11-13 12:09:03 +09:00
oprofile	oprofile, arm/sh: Fix oprofile_arch_exit() linkage issue	2011-12-23 11:58:34 +01:00
tools	sh: Add RSK2+SH7269 board	2012-05-10 17:20:01 +09:00
Kconfig	Kconfig cleanups for v3.13	2013-11-15 14:05:15 -08:00
Kconfig.cpu	arch/sh: remove depends on CONFIG_EXPERIMENTAL	2013-01-21 14:43:13 -08:00
Kconfig.debug	sh: dwarf unwinder depends on SHcompact.	2012-03-30 19:31:22 +09:00
Makefile	sh: Setup CROSS_COMPILE at the top	2012-06-13 11:42:13 +09:00