android_kernel_motorola_sm6225/Documentation/x86
Ingo Molnar 0d5959723e Merge branch 'linus' into x86/mce3
Conflicts:
	arch/x86/kernel/cpu/mcheck/mce_64.c
	arch/x86/kernel/irq.c

Merge reason: Resolve the conflicts above.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
2009-06-11 23:31:52 +02:00
..
i386 x86: doc: move x86-generic documentation from Doc/x86/i386 2008-07-22 15:34:38 -04:00
x86_64 Merge branch 'linus' into x86/mce3 2009-06-11 23:31:52 +02:00
00-INDEX documentation: move mtrr.txt to Doc/x86/ subdir 2008-07-28 14:46:49 +02:00
boot.txt x86: add extension fields for bootloader type and version 2009-05-11 17:45:06 -07:00
earlyprintk.txt x86/doc: mini-howto for using earlyprintk=dbgp 2009-03-05 10:57:52 +01:00
mtrr.txt documentation: move mtrr.txt to Doc/x86/ subdir 2008-07-28 14:46:49 +02:00
pat.txt x86: PAT: pfnmap documentation update changes 2008-12-19 15:40:31 -08:00
usb-legacy-support.txt x86: doc: move x86-generic documentation from Doc/x86/i386 2008-07-22 15:34:38 -04:00
zero-page.txt documentation: update header file paths 2009-01-06 15:59:28 -08:00