H. Peter Anvin 68d00bbebb Merge remote-tracking branch 'origin/x86/mm' into x86/mm2 ... Explicitly merging these two branches due to nontrivial conflicts and to allow further work. Resolved Conflicts: arch/x86/kernel/head32.c arch/x86/kernel/head64.c arch/x86/mm/init_64.c arch/x86/realmode/init.c Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>		2013-02-01 02:28:36 -08:00
..
ce4100	TTY/Serial merge for 3.8-rc1	2012-12-11 14:08:47 -08:00
efi	Merge remote-tracking branch 'origin/x86/mm' into x86/mm2	2013-02-01 02:28:36 -08:00
geode	arch/x86/platform/geode/net5501.c: change active_low to 0 for LED driver	2012-05-04 14:40:07 -07:00
iris	arch/x86/platform/iris/iris.c: register a platform device and a platform driver	2012-12-18 15:02:11 -08:00
mrst	X86: drivers: remove __dev* attributes.	2013-01-03 15:57:04 -08:00
olpc	X86: drivers: remove __dev* attributes.	2013-01-03 15:57:04 -08:00
scx200	X86: drivers: remove __dev* attributes.	2013-01-03 15:57:04 -08:00
sfi	Merge branch 'linus' into x86/apic-cleanups	2011-01-07 14:14:15 +01:00
uv	Merge branch 'x86-mm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2012-07-26 13:17:17 -07:00
visws	x86/apic: Fix typo EIO_ACK -> EOI_ACK and document it	2012-05-18 09:46:07 +02:00
Makefile	x86: geode: New PCEngines Alix system driver	2011-09-21 11:19:42 +02:00