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

Conflicts:
	drivers/net/wireless/iwlwifi/pcie/tx.c

Minor iwlwifi conflict in TX queue disabling between 'net', which
removed a bogus warning, and 'net-next' which added some status
register poking code.

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

2012-11-25 12:49:17 -05:00

..

alpha

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

2012-11-25 12:49:17 -05:00

arm

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

2012-11-25 12:49:17 -05:00

arm64

arm64: Distinguish between user and kernel XN bits

2012-11-16 15:50:25 +00:00

avr32

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

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

blackfin

…

c6x

…

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

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

2012-11-17 22:00:43 -05:00

hexagon

…

ia64

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

2012-11-17 22:00:43 -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-25 12:49:17 -05:00

microblaze

…

mips

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

2012-11-17 22:00:43 -05:00

mn10300

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

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

openrisc

…

parisc

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

2012-11-25 12:49:17 -05:00

powerpc

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

2012-11-25 12:49:17 -05:00

s390

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

2012-11-17 22:00:43 -05:00

score

…

sh

…

sparc

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

2012-11-25 12:49:17 -05:00

tile

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

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

um

…

unicore32

arch/unicore32: remove CONFIG_EXPERIMENTAL

2012-11-09 17:30:10 +08:00

x86

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

2012-11-25 12:49:17 -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

…