David S. Miller aa4abc9bcc Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 ...

Conflicts:
	drivers/net/wireless/iwlwifi/iwl-tx.c
	net/8021q/vlan_core.c
	net/core/dev.c

2009-03-01 21:35:16 -08:00

..

alpha

Merge branch 'master' of /home/davem/src/GIT/linux-2.6/

2009-02-24 03:50:29 -08:00

arm

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

2009-03-01 21:35:16 -08:00

avr32

Merge branch 'master' of /home/davem/src/GIT/linux-2.6/

2009-02-24 03:50:29 -08:00

blackfin

net: new user space API for time stamping of incoming and outgoing packets

2009-02-15 22:43:33 -08:00

cris

net: new user space API for time stamping of incoming and outgoing packets

2009-02-15 22:43:33 -08:00

frv

…

h8300

net: new user space API for time stamping of incoming and outgoing packets

2009-02-15 22:43:33 -08:00

ia64

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

2009-03-01 21:35:16 -08:00

m32r

…

m68k

Merge branch 'master' of /home/davem/src/GIT/linux-2.6/

2009-02-24 03:50:29 -08:00

m68knommu

fec: add FEC platform support to ColdFire CPU's setup code

2009-02-26 22:40:38 -08:00

mips

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

2009-03-01 21:35:16 -08:00

mn10300

mn10300: fix typo && -> || in arch/mn10300/unit-asb2305/pci.c

2009-02-20 17:57:48 -08:00

parisc

net: new user space API for time stamping of incoming and outgoing packets

2009-02-15 22:43:33 -08:00

powerpc

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

2009-03-01 21:35:16 -08:00

s390

Merge branch 'master' of /home/davem/src/GIT/linux-2.6/

2009-02-24 03:50:29 -08:00

sh

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

2009-03-01 21:35:16 -08:00

sparc

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

2009-03-01 21:35:16 -08:00

um

uml: fix vde network backend in user mode linux

2009-02-20 17:57:48 -08:00

x86

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

2009-03-01 21:35:16 -08:00

xtensa

net: new user space API for time stamping of incoming and outgoing packets

2009-02-15 22:43:33 -08:00

.gitignore

…

Kconfig

…