Merge branch 'linus' into x86/header-guards (1503af66) · Commits · hpc / Old_Soft / kernel

Commit 1503af66 authored Jul 26, 2008 by

Ingo Molnar



Conflicts:

	include/asm-x86/gpio.h
	include/asm-x86/ide.h

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

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.

Please register or to comment