Linus Torvalds 6a76a69923 Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 ... Pull crypto fixes from Herbert Xu: "This fixes a build problem where two crypto modules both try to export the same symbols (which shouldn't have been exported in the first place)." * git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: crypto: twofish-x86_64-3way - module init/exit functions should be static crypto: camellia-x86_64 - module init/exit functions should be static		2012-03-22 20:19:30 -07:00
..
boot	Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2012-03-22 09:44:50 -07:00
configs	iommu: Rename the DMAR and INTR_REMAP config options	2011-09-21 10:22:03 +02:00
crypto	Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6	2012-03-22 20:19:30 -07:00
ia32	Merge branch 'x86-fpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2012-03-22 09:41:22 -07:00
include/asm	Features:	2012-03-22 20:16:14 -07:00
kernel	Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2012-03-22 09:44:50 -07:00
kvm	Merge branch 'x86-fpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2012-03-22 09:41:22 -07:00
lguest	lguest: Make sure interrupt is allocated ok by lguest_setup_irq	2012-01-12 15:44:47 +10:30
lib	Merge branch 'x86-atomic-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2012-03-22 09:23:57 -07:00
math-emu
mm	Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2012-03-22 09:44:50 -07:00
net	net: bpf_jit: fix BPF_S_LDX_B_MSH compilation	2012-03-19 17:41:44 -04:00
oprofile	Merge branch 'core' of git://amd64.org/linux/rric into perf/core	2011-11-15 11:05:18 +01:00
pci	Features:	2012-03-22 20:16:14 -07:00
platform	Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux	2012-03-22 13:08:22 -07:00
power	i387: Split up <asm/i387.h> into exported and internal interfaces	2012-02-21 14:12:54 -08:00
syscalls	x86, syscall: Allow syscall offset to be symbolic	2011-11-18 17:01:19 -08:00
tools	x86/tools: Add decoded instruction dump mode	2011-12-05 14:53:23 +01:00
um	uml: fix compile for x86-64	2012-01-18 19:26:11 -08:00
vdso	Merge branch 'x86-cpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2011-10-28 05:03:12 -07:00
video	x86: fix up files really needing to include module.h	2011-10-31 19:30:36 -04:00
xen	Features:	2012-03-22 20:16:14 -07:00
.gitignore	x86/kprobes: Add arch/x86/tools/insn_sanity to .gitignore	2012-01-16 08:21:59 +01:00
Kbuild	net: filter: Just In Time compiler for x86-64	2011-04-27 23:05:08 -07:00
Kconfig	Merge branch 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2012-03-22 09:43:22 -07:00
Kconfig.cpu	x86: Tighten dependencies of CPU_SUP_*_32	2012-03-08 10:57:34 +01:00
Kconfig.debug	Merge branch 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2012-01-11 19:13:40 -08:00
Makefile	x86: Generate system call tables and unistd_*.h from tables	2011-11-17 13:35:37 -08:00
Makefile_32.cpu	x86, cpu: Move AMD Elan Kconfig under "Processor family"	2011-04-08 13:01:25 -07:00
Makefile.um	um: take arch/um/sys-x86 to arch/x86/um	2011-11-02 14:15:05 +01:00