1
linux/include
Ingo Molnar c493756e2a Merge branch 'linus' into oprofile
Conflicts:
	arch/x86/kernel/apic_32.c
	include/linux/pci_ids.h
2008-10-13 10:52:30 +02:00
..
acpi
asm-arm
asm-cris
asm-frv
asm-generic Merge branch 'x86/urgent' into core/signal 2008-10-12 11:32:17 +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 signals: demultiplexing SIGTRAP signal 2008-09-23 13:26:52 +02:00
asm-um
asm-x86 Merge branches 'x86/xen', 'x86/build', 'x86/microcode', 'x86/mm-debug-v2', 'x86/memory-corruption-check', 'x86/early-printk', 'x86/xsave', 'x86/ptrace-v2', 'x86/quirks', 'x86/setup', 'x86/spinlocks' and 'x86/signal' into x86/core-v2 2008-10-12 15:50:02 +02:00
asm-xtensa
crypto
drm
keys
linux Merge branch 'linus' into oprofile 2008-10-13 10:52:30 +02: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 xen: remove unused balloon.h 2008-10-03 10:04:10 +02:00
Kbuild