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

Conflicts:
	drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c

Minor conflict between the BCM_CNIC define removal in net-next
and a bug fix added to net.  Based upon a conflict resolution
patch posted by Stephen Rothwell.

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

2012-11-10 18:32:51 -05:00

..

alpha

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

2012-11-10 18:32:51 -05:00

arm

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

2012-11-10 18:32:51 -05:00

arm64

arm64: fix alignment padding in assembly code

2012-10-20 11:12:01 +01:00

avr32

sk-filter: Add ability to get socket filter program (v2)

2012-11-01 11:17:15 -04:00

blackfin

Merge branch 'modules-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux

2012-10-14 13:39:34 -07:00

c6x

Merge branch 'modules-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux

2012-10-14 13:39:34 -07:00

cris

sk-filter: Add ability to get socket filter program (v2)

2012-11-01 11:17:15 -04:00

frv

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

2012-11-10 18:32:51 -05:00

h8300

sk-filter: Add ability to get socket filter program (v2)

2012-11-01 11:17:15 -04:00

hexagon

Hexagon: Copyright marking changes

2012-10-18 17:07:21 -05:00

ia64

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

2012-11-10 18:32:51 -05:00

m32r

sk-filter: Add ability to get socket filter program (v2)

2012-11-01 11:17:15 -04:00

m68k

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

2012-11-10 18:32:51 -05:00

microblaze

Merge branch 'modules-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux

2012-10-14 13:39:34 -07:00

mips

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

2012-11-10 18:32:51 -05:00

mn10300

sk-filter: Add ability to get socket filter program (v2)

2012-11-01 11:17:15 -04:00

openrisc

Merge branch 'modules-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux

2012-10-14 13:39:34 -07:00

parisc

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

2012-11-10 18:32:51 -05:00

powerpc

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

2012-11-10 18:32:51 -05:00

s390

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

2012-11-10 18:32:51 -05:00

score

Merge branch 'modules-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux

2012-10-14 13:39:34 -07:00

sh

UAPI: Make arch/sh/include/uapi/asm/hw_breakpoint.h non-empty

2012-10-17 12:32:35 +01:00

sparc

sparc: bpf_jit_comp: add VLAN instructions for BPF JIT

2012-11-06 17:41:42 -05:00

tile

arch/tile: avoid build warnings from duplicate ELF_R_xxx #defines

2012-10-23 10:22:48 -04:00

um

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

2012-10-13 10:05:52 +09:00

unicore32

Merge branch 'modules-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux

2012-10-14 13:39:34 -07:00

x86

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

2012-11-10 18:32:51 -05:00

xtensa

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

2012-11-10 18:32:51 -05:00

.gitignore

…

Kconfig

Merge branch 'modules-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux

2012-10-14 13:39:34 -07:00