David S. Miller 56c5d900db Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6 ...

Conflicts:

	sound/core/memalloc.c

2008-10-11 12:39:35 -07:00

..

acpi

…

asm-arm

…

asm-cris

…

asm-frv

…

asm-generic

Merge branch 'x86/unify-cpu-detect' into x86-v28-for-linus-phase4-D

2008-10-11 20:23:20 +02:00

asm-m32r

…

asm-m68k

…

asm-mips

MIPS: Move headfiles to new location below arch/mips/include

2008-10-11 16:18:52 +01:00

asm-mn10300

…

asm-parisc

…

asm-um

…

asm-x86

Merge branch 'x86/unify-cpu-detect' into x86-v28-for-linus-phase4-D

2008-10-11 20:23:20 +02:00

asm-xtensa

…

crypto

…

drm

…

keys

…

linux

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

2008-10-11 12:39:35 -07:00

math-emu

…

media

…

mtd

…

net

net: fix dummy 'nf_conntrack_event_cache()'

2008-10-11 09:46:24 -07:00

pcmcia

…

rdma

…

rxrpc

…

scsi

Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6

2008-10-10 10:53:26 -07:00

sound

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

2008-10-11 12:39:35 -07:00

video

Merge branch 'pxa-all' into devel

2008-10-09 21:33:02 +01:00

xen

…

Kbuild

…