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

Conflicts:

	drivers/net/ixgbe/ixgbe_main.c
	drivers/net/smc91x.c

2008-12-02 19:50:27 -08:00

..

alpha

alpha: pcibios_resource_to_bus() is callable from normal code

2008-11-30 10:03:37 -08:00

arm

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

2008-12-02 19:50:27 -08:00

avr32

Merge branches 'boards' and 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen/avr32-2.6

2008-10-23 15:24:10 +02:00

blackfin

Blackfin arch: fix a broken define in dma-mapping

2008-11-18 17:48:22 +08:00

cris

[CRIS] Remove links from CRIS build

2008-10-31 23:37:57 +01:00

frv

frv: fix mmap2 error handling

2008-12-01 19:55:24 -08:00

h8300

Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/dvrabel/uwb

2008-10-23 08:20:34 -07:00

ia64

Merge branch 'kvm-updates/2.6.28' of git://git.kernel.org/pub/scm/linux/kernel/git/avi/kvm

2008-12-02 15:56:17 -08:00

m32r

m32r: section noise in head.S

2008-11-30 10:03:37 -08:00

m68k

m68k: Update defconfigs for 2.6.28-rc7

2008-12-02 20:58:26 +01:00

m68knommu

container freezer: implement freezer cgroup subsystem

2008-10-20 08:52:34 -07:00

mips

remove __ARCH_WANT_COMPAT_SYS_PTRACE

2008-11-30 11:00:15 -08:00

mn10300

MN10300: Fix application of kernel module relocations

2008-12-02 15:52:07 -08:00

parisc

Merge git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6

2008-11-30 14:04:31 -08:00

powerpc

Merge branch 'kvm-updates/2.6.28' of git://git.kernel.org/pub/scm/linux/kernel/git/avi/kvm

2008-12-02 15:56:17 -08:00

s390

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

2008-12-02 19:50:27 -08:00

sh

serial: sh-sci: Reorder the SCxTDR write after the TDxE clear.

2008-11-13 17:46:06 +09:00

sparc

remove __ARCH_WANT_COMPAT_SYS_PTRACE

2008-11-30 11:00:15 -08:00

sparc64

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

2008-12-02 19:50:27 -08:00

um

net: convert more to %pM

2008-10-27 17:47:26 -07:00

x86

Merge branch 'kvm-updates/2.6.28' of git://git.kernel.org/pub/scm/linux/kernel/git/avi/kvm

2008-12-02 15:56:17 -08:00

xtensa

net: convert more to %pM

2008-10-27 17:47:26 -07:00

.gitignore

arch: Ignore arch/i386 and arch/x86_64

2008-01-19 21:29:39 -08:00

Kconfig

remove __ARCH_WANT_COMPAT_SYS_PTRACE

2008-11-30 11:00:15 -08:00