Commit 1c2a48cf authored 14 years ago by Ingo Molnar

Merge branch 'linus' into x86/apic-cleanups


Conflicts:
	arch/x86/include/asm/io_apic.h

Merge reason: Resolve the conflict, update to a more recent -rc base

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

parents 0aa002fe cb600d2f

No related branches found

No related tags found

Hide whitespace changes

Inline Side-by-side

Showing with 450 additions and 322 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