Ingo Molnar af37501c79 Merge branch 'core/percpu' into perfcounters/core ... Conflicts: arch/x86/include/asm/pda.h We merge tip/core/percpu into tip/perfcounters/core because of a semantic and contextual conflict: the former eliminates the PDA, while the latter extends it with apic_perf_irqs field. Resolve the conflict by moving the new field to the irq_cpustat structure on 64-bit too. Signed-off-by: Ingo Molnar <mingo@elte.hu>		2009-01-18 18:15:49 +01:00
..
acpi	Merge branch 'simplify_PRT' into release	2009-01-09 03:41:08 -05:00
asm-arm
asm-frv	NOMMU: Make VMAs per MM as for MMU-mode linux	2009-01-08 12:04:47 +00:00
asm-generic	linker script: add missing VMLINUX_SYMBOL	2009-01-17 15:26:12 +09:00
asm-h8300
asm-m32r	NOMMU: Make VMAs per MM as for MMU-mode linux	2009-01-08 12:04:47 +00:00
asm-m68k	m68k: Wire up sys_restart_syscall	2009-01-12 20:56:43 +01:00
asm-mn10300	mn10300: introduce asm/swab.h	2009-01-06 18:10:29 -08:00
crypto
drm
keys
linux	Merge branch 'core/percpu' into perfcounters/core	2009-01-18 18:15:49 +01:00
math-emu
media
mtd	trivial: fix then -> than typos in comments and documentation	2009-01-06 11:28:06 +01:00
net	wimax: fix typo in kernel-doc for debugfs_dentry in struct wimax_dev	2009-01-11 00:06:32 -08:00
pcmcia
rdma
rxrpc
scsi	[SCSI] fc transport: restore missing dev_loss_tmo callback to LLDD	2009-01-06 09:43:33 -06:00
sound	Merge branch 'topic/asoc' into for-linus	2009-01-12 14:05:50 +01:00
trace
video
xen	xen: add xenfs to allow usermode <-> Xen interaction	2009-01-08 08:30:59 -08:00
Kbuild