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

Conflicts:
	drivers/net/ethernet/rocker/rocker.c

The rocker commit was two overlapping changes, one to rename
the ->vport member to ->pport, and another making the bitmask
expression use '1ULL' instead of plain '1'.

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

2015-03-03 21:16:48 -05:00

..

alpha

asm-generic: uaccess.h cleanup

2015-02-18 10:02:24 -08:00

arc

Merge branch 'for-linus' of git://git.infradead.org/users/vkoul/slave-dma

2015-02-18 08:49:20 -08:00

arm

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

2015-03-03 15:30:07 -08:00

arm64

ARM: SoC fixes for 3.20-rc1

2015-02-27 16:18:33 -08:00

avr32

asm-generic: uaccess.h cleanup

2015-02-18 10:02:24 -08:00

blackfin

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

2015-02-21 12:59:04 -08:00

c6x

all arches, signal: move restart_block to struct task_struct

2015-02-12 18:54:12 -08:00

cris

CRIS changes for 3.20

2015-02-15 18:02:02 -08:00

frv

mm: add missing __PAGETABLE_{PUD,PMD}_FOLDED defines

2015-02-28 09:57:51 -08:00

hexagon

all arches, signal: move restart_block to struct task_struct

2015-02-12 18:54:12 -08:00

ia64

asm-generic: uaccess.h cleanup

2015-02-18 10:02:24 -08:00

m32r

mm: add missing __PAGETABLE_{PUD,PMD}_FOLDED defines

2015-02-28 09:57:51 -08:00

m68k

mm: add missing __PAGETABLE_{PUD,PMD}_FOLDED defines

2015-02-28 09:57:51 -08:00

metag

metag: Fix KSTK_EIP() and KSTK_ESP() macros

2015-02-24 12:54:21 +00:00

microblaze

all arches, signal: move restart_block to struct task_struct

2015-02-12 18:54:12 -08:00

mips

Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus

2015-02-21 19:41:38 -08:00

mn10300

mm: add missing __PAGETABLE_{PUD,PMD}_FOLDED defines

2015-02-28 09:57:51 -08:00

nios2

nios2 for v3.20

2015-02-17 14:23:42 -08:00

openrisc

asm-generic: uaccess.h cleanup

2015-02-18 10:02:24 -08:00

parisc

mm: add missing __PAGETABLE_{PUD,PMD}_FOLDED defines

2015-02-28 09:57:51 -08:00

powerpc

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

2015-03-03 21:16:48 -05:00

s390

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

2015-03-03 21:16:48 -05:00

score

all arches, signal: move restart_block to struct task_struct

2015-02-12 18:54:12 -08:00

sh

asm-generic: uaccess.h cleanup

2015-02-18 10:02:24 -08:00

sparc

asm-generic: uaccess.h cleanup

2015-02-18 10:02:24 -08:00

tile

tile: use %*pb[l] to print bitmaps including cpumasks and nodemasks

2015-02-13 21:21:37 -08:00

um

all arches, signal: move restart_block to struct task_struct

2015-02-12 18:54:12 -08:00

unicore32

mm: vmalloc: pass additional vm_flags to __vmalloc_node_range()

2015-02-13 21:21:42 -08:00

x86

Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

2015-03-01 12:22:44 -08:00

xtensa

asm-generic: uaccess.h cleanup

2015-02-18 10:02:24 -08:00

.gitignore

…

Kconfig

…