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

Conflicts:
	drivers/net/vmxnet3/vmxnet3_drv.c

Small vmxnet3 conflict with header size bug fix in 'net'.

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

2012-03-05 21:16:26 -05:00

..

boot

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

include/asm

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2012-03-05 21:16:26 -05:00

kernel

Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci

2012-01-11 18:50:26 -08:00

lib

atomic: use <linux/atomic.h>

2011-07-26 16:49:47 -07:00

math-emu

alpha: change to new Makefile flag variables

2011-01-17 05:42:13 +01:00

mm

alpha, mm: set all online nodes in N_NORMAL_MEMORY

2011-05-25 08:39:23 -07:00

oprofile

Fix common misspellings

2011-03-31 11:26:23 -03:00

defconfig

defconfig reduction

2010-08-14 22:26:53 +02:00

Kconfig

alpha: switch to GENERIC_PCI_IOMAP

2011-11-28 21:13:01 +02:00

Kconfig.debug

alpha/parisc: remove config variable DEBUG_RWLOCK

2008-02-06 10:41:03 -08:00

Makefile

alpha: link failure fix

2008-06-20 16:46:10 -07:00