H. Peter Anvin 0da3e7f526 Merge branch 'x86/mm2' into x86/mm ... x86/mm2 is testing out fine, but has developed conflicts with x86/mm due to patches in adjacent code. Merge them so we can drop x86/mm2 and have a unified branch. Resolved Conflicts: arch/x86/kernel/setup.c		2013-02-15 09:25:08 -08:00
..
boot	x86, boot: Update comments about entries for 64bit image	2013-01-29 19:32:57 -08:00
configs	x86/Kconfig: Turn off DEBUG_NX_TEST module in defconfigs	2012-09-05 10:43:12 +02:00
crypto	Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6	2012-12-15 12:35:19 -08:00
ia32	new helpers: __save_altstack/__compat_save_altstack, switch x86 and um to those	2012-12-19 18:07:41 -05:00
include	Merge branch 'x86/mm2' into x86/mm	2013-02-15 09:25:08 -08:00
kernel	Merge branch 'x86/mm2' into x86/mm	2013-02-15 09:25:08 -08:00
kvm	KVM: x86: use dynamic percpu allocations for shared msrs area	2013-01-08 12:51:56 -02:00
lguest	Linux 3.8-rc5	2013-01-25 16:31:21 -08:00
lib	x86: Be consistent with data size in getuser.S	2013-02-11 23:14:48 -08:00
math-emu	x86: Rename trap_no to trap_nr in thread_struct	2012-03-13 06:24:09 +01:00
mm	Merge remote-tracking branch 'origin/x86/mm' into x86/mm2	2013-02-01 02:28:36 -08:00
net	x86: bpf_jit_comp: add vlan tag support	2012-10-31 14:00:15 -04:00
oprofile	oprofile, x86: Fix wrapping bug in op_x86_get_ctrl()	2012-10-15 14:38:24 +02:00
pci	X86: drivers: remove __dev* attributes.	2013-01-03 15:57:04 -08:00
platform	Merge remote-tracking branch 'origin/x86/mm' into x86/mm2	2013-02-01 02:28:36 -08:00
power	Merge remote-tracking branch 'origin/x86/mm' into x86/mm2	2013-02-01 02:28:36 -08:00
realmode	Merge remote-tracking branch 'origin/x86/mm' into x86/mm2	2013-02-01 02:28:36 -08:00
syscalls	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal	2012-12-20 18:05:28 -08:00
tools	x86/boot: Fix minor fd leakage in tools/relocs.c	2013-01-27 10:24:28 -08:00
um	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal	2012-12-20 18:05:28 -08:00
vdso	Merge tag 'kvm-3.8-1' of git://git.kernel.org/pub/scm/virt/kvm/kvm	2012-12-13 15:31:08 -08:00
video	x86: Use vga_default_device() when determining whether an fb is primary	2012-04-24 09:50:17 +01:00
xen	Merge remote-tracking branch 'origin/x86/boot' into x86/mm2	2013-01-29 15:10:15 -08:00
.gitignore	x86/kprobes: Add arch/x86/tools/insn_sanity to .gitignore	2012-01-16 08:21:59 +01:00
Kbuild	x86, realmode: realmode.bin infrastructure	2012-05-08 11:41:48 -07:00
Kconfig	x86-32, mm: Rip out x86_32 NUMA remapping code	2013-01-31 14:12:30 -08:00
Kconfig.cpu	x86, 386 removal: Document Nx586 as a 386 and thus unsupported	2012-11-29 13:28:39 -08:00
Kconfig.debug	x86/tlb: add tlb_flushall_shift knob into debugfs	2012-06-27 19:29:10 -07:00
Makefile	md update for 3.8	2012-12-18 09:32:44 -08:00
Makefile_32.cpu	x86, 386 removal: Remove CONFIG_M386 from Kconfig	2012-11-29 13:23:01 -08:00
Makefile.um	um: fix linker script generation	2012-04-09 13:59:00 -04:00