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

Conflicts:
	net/ipv4/fib_frontend.c

2010-12-26 22:37:05 -08:00

..

alpha

Merge branch 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6

2010-10-28 16:16:39 -07:00

arm

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

2010-12-26 22:37:05 -08:00

avr32

Merge branch 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6

2010-10-28 16:16:39 -07:00

blackfin

BKL: remove extraneous #include <smp_lock.h>

2010-11-17 08:59:32 -08:00

cris

Merge branch 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6

2010-10-28 16:16:39 -07:00

frv

BKL: remove extraneous #include <smp_lock.h>

2010-11-17 08:59:32 -08:00

h8300

BKL: remove extraneous #include <smp_lock.h>

2010-11-17 08:59:32 -08:00

ia64

SCSI host lock push-down

2010-11-16 13:33:23 -08:00

m32r

Merge branch 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6

2010-10-28 16:16:39 -07:00

m68k

BKL: remove extraneous #include <smp_lock.h>

2010-11-17 08:59:32 -08:00

m68knommu

BKL: remove extraneous #include <smp_lock.h>

2010-11-17 08:59:32 -08:00

microblaze

Merge branch 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6

2010-10-28 16:16:39 -07:00

mips

MIPS: Fix build errors in sc-mips.c

2010-12-17 19:44:35 +00:00

mn10300

clarify a usage constraint for cnt32_to_63()

2010-12-20 09:07:35 -08:00

parisc

parisc: convert the rest of the irq handlers to simple/percpu

2010-12-04 11:15:19 -05:00

powerpc

powerpc/mpc5200: include fs.h in mpc52xx_gpt.c

2010-12-23 12:08:02 -07:00

s390

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

2010-12-26 22:37:05 -08:00

score

Merge branch 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6

2010-10-28 16:16:39 -07:00

sh

sh: wire up accept4 syscall (non-multiplexed path)

2010-12-14 17:58:10 +09:00

sparc

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6

2010-12-14 17:34:00 -08:00

tile

arch/tile: handle rt_sigreturn() more cleanly

2010-12-17 16:59:29 -05:00

um

uml: disable winch irq before freeing handler data

2010-11-25 06:50:39 +09:00

x86

Merge branches 'perf-fixes-for-linus' and 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

2010-12-23 15:39:40 -08:00

xtensa

Merge branch 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6

2010-10-28 16:16:39 -07:00

.gitignore

…

Kconfig

jump label: Add work around to i386 gcc asm goto bug

2010-10-29 14:45:29 -04:00