David S. Miller 143c905494 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...

Conflicts:
	drivers/net/ethernet/intel/i40e/i40e_main.c
	drivers/net/macvtap.c

Both minor merge hassles, simple overlapping changes.

Signed-off-by: David S. Miller <davem@davemloft.net>

2013-12-18 16:42:06 -05:00

..

boards

avr32: favr-32: clk_round_rate() can return a zero upon error

2013-12-10 08:46:38 +01:00

boot

avr32: fix out-of-range jump in large kernels

2013-11-20 09:53:21 +01:00

configs

avr32: Kill CONFIG_MTD_PARTITIONS

2013-12-10 08:46:37 +01:00

include

lib: Add missing arch generic-y entries for asm-generic/hash.h

2013-12-17 21:26:19 -05:00

kernel

avr32: remove deprecated IRQF_DISABLED

2013-12-10 08:46:38 +01:00

lib

ARCH: drivers remove __dev* attributes.

2013-01-03 15:57:13 -08:00

mach-at32ap

avr32: pm: Fix section mismatch

2013-12-10 08:46:38 +01:00

mm

arch: mm: pass userspace fault flag to generic fault handler

2013-09-12 15:38:01 -07:00

oprofile

oprofilefs_create_...() do not need superblock argument

2013-09-03 22:52:48 -04:00

Kconfig

Remove GENERIC_HARDIRQ config option

2013-09-13 15:09:52 +02:00

Kconfig.debug

[AVR32] Include instrumentation menu

2008-01-25 08:31:40 +01:00

Makefile

kbuild: allow assignment to {A,C,LD}FLAGS_MODULE on the command line

2010-08-03 14:09:45 +02:00