Merge branch 'linus' into x86/header-guards
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 sign in to comment