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

Conflicts:

	arch/x86/kernel/io_apic.c

2008-12-31 23:05:57 +10:30

..

boot

…

configs

…

crypto

…

ia32

Merge branch 'x86-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

2008-12-28 12:07:57 -08:00

include/asm

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

2008-12-31 23:05:57 +10:30

kernel

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

2008-12-31 23:05:57 +10:30

kvm

…

lguest

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

2008-12-31 23:05:57 +10:30

lib

…

mach-default

…

mach-generic

…

mach-rdc321x

…

mach-voyager

…

math-emu

…

mm

Merge branch 'core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

2008-12-30 16:10:19 -08:00

oprofile

Merge branch 'oprofile-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

2008-12-30 17:31:25 -08:00

pci

…

power

…

scripts

…

vdso

Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6

2008-12-28 12:33:21 -08:00

video

…

xen

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

2008-12-30 08:02:35 +10:30

Kconfig

Merge branch 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

2008-12-30 16:20:19 -08:00

Kconfig.cpu

…

Kconfig.debug

Merge branch 'tracing-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

2008-12-28 12:21:10 -08:00

Makefile

…

Makefile_32.cpu

…