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

Conflicts:
	Documentation/networking/ip-sysctl.txt
	drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c

Both conflicts were simply overlapping context.

A build fix for qlcnic is in here too, simply removing the added
devinit annotations which no longer exist.

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

2013-01-15 15:05:59 -05:00

..

alpha

ALPHA: drivers: remove __dev* attributes.

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

arm

DeviceTree fixes for 3.8

2013-01-14 13:19:08 -08:00

arm64

arm64: dts: prevent *.dtb from always being rebuilt

2013-01-14 08:08:28 -06:00

avr32

ARCH: drivers remove __dev* attributes.

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

blackfin

ARCH: drivers remove __dev* attributes.

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

c6x

These are a few cleanups for asm-generic:

2012-12-21 16:39:08 -08:00

cris

ARCH: drivers remove __dev* attributes.

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

frv

ARCH: drivers remove __dev* attributes.

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

h8300

These are a few cleanups for asm-generic:

2012-12-21 16:39:08 -08:00

hexagon

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

2012-12-20 18:05:28 -08:00

ia64

Driver core __dev* removal patches

2013-01-03 16:17:50 -08:00

m32r

ARCH: drivers remove __dev* attributes.

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

m68k

ARCH: drivers remove __dev* attributes.

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

microblaze

Merge branch 'next' of git://git.monstr.eu/linux-2.6-microblaze

2013-01-07 07:39:32 -08:00

mips

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

2013-01-07 07:50:41 -08:00

mn10300

arch/mn10300/Kconfig: select CONFIG_GENERIC_ATOMIC64

2013-01-11 14:54:55 -08:00

openrisc

ARCH: drivers remove __dev* attributes.

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

parisc

ARCH: drivers remove __dev* attributes.

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

powerpc

Merge git://git.kernel.org/pub/scm/virt/kvm/kvm

2013-01-10 09:05:18 -08:00

s390

s390/pci: define read*_relaxed functions

2013-01-08 10:57:11 +01:00

score

ARCH: drivers remove __dev* attributes.

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

sh

ARCH: drivers remove __dev* attributes.

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

sparc

sparc: remove __devinit, __devexit annotations

2013-01-12 15:28:45 -08:00

tile

ARCH: drivers remove __dev* attributes.

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

um

ethtool: fix drvinfo strings set in drivers

2013-01-06 21:06:31 -08:00

unicore32

ARCH: drivers remove __dev* attributes.

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

x86

Merge git://git.kernel.org/pub/scm/virt/kvm/kvm

2013-01-10 09:05:18 -08:00

xtensa

These are a few cleanups for asm-generic:

2012-12-21 16:39:08 -08:00

.gitignore

…

Kconfig

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

2012-12-20 18:05:28 -08:00