Merge branch 'core/percpu' into percpu-cpumask-x86-for-linus-2

Browse source

Conflicts:
	arch/parisc/kernel/irq.c
	arch/x86/include/asm/fixmap_64.h
	arch/x86/include/asm/setup.h
	kernel/irq/handle.c

Semantic merge:
        arch/x86/include/asm/fixmap.h

Signed-off-by: Ingo Molnar <mingo@elte.hu>

...

This commit is contained in:

Ingo Molnar 2009-03-26 21:39:17 +01:00

parent be0ea69674 60db564220

commit 6e15cf0486

485 changed files with 25832 additions and 25988 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

4

drivers/gpu/drm/drm_proc.c

View file