Commit b2b062b8 authored 16 years ago by Ingo Molnar

Merge branch 'core/percpu' into stackprotector


Conflicts:
	arch/x86/include/asm/pda.h
	arch/x86/include/asm/system.h

Also, moved include/asm-x86/stackprotector.h to arch/x86/include/asm.

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

parents a9de18eb 99937d64

No related branches found

No related tags found

Hide whitespace changes

Inline Side-by-side

Showing with 1462 additions and 115 deletions

Some changes are not shown.

For a faster browsing experience, only 20 of 1000+ files are shown. Download one of the files below to see all changes.

Plain diff Email patch

Please register or to comment