Arnd Bergmann 1c8d29696f Merge branch 'io' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux into asm-generic ... * 'io' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux: documentation: memory-barriers: clarify relaxed io accessor semantics x86: io: implement dummy relaxed accessor macros for writes tile: io: implement dummy relaxed accessor macros for writes sparc: io: implement dummy relaxed accessor macros for writes powerpc: io: implement dummy relaxed accessor macros for writes parisc: io: implement dummy relaxed accessor macros for writes mn10300: io: implement dummy relaxed accessor macros for writes m68k: io: implement dummy relaxed accessor macros for writes m32r: io: implement dummy relaxed accessor macros for writes ia64: io: implement dummy relaxed accessor macros for writes cris: io: implement dummy relaxed accessor macros for writes frv: io: implement dummy relaxed accessor macros for writes xtensa: io: remove dummy relaxed accessor macros for reads s390: io: remove dummy relaxed accessor macros for reads microblaze: io: remove dummy relaxed accessor macros asm-generic: io: implement relaxed accessor macros as conditional wrappers Conflicts: include/asm-generic/io.h Signed-off-by: Arnd Bergmann <arnd@arndb.de>		2014-11-11 19:55:45 +01:00
..
boot	Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2014-10-14 02:28:16 +02:00
configs	x86: Add "make tinyconfig" to configure the tiniest possible kernel	2014-08-08 16:30:24 -07:00
crypto	Revert "crypto: aesni - disable "by8" AVX CTR optimization"	2014-10-02 14:40:28 +08:00
ia32	Merge git://git.infradead.org/users/eparis/audit	2014-10-19 16:25:56 -07:00
include	Merge branch 'io' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux into asm-generic	2014-11-11 19:55:45 +01:00
kernel	Merge git://git.infradead.org/users/eparis/audit	2014-10-19 16:25:56 -07:00
kvm	x86,kvm,vmx: Preserve CR4 across VM entry	2014-10-18 10:09:03 -07:00
lguest	asmlinkage, x86: Add explicit __visible to arch/x86/*	2014-05-05 16:07:44 -07:00
lib	Merge branch 'x86-asm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2014-10-13 18:14:50 +02:00
math-emu	asmlinkage, x86: Add explicit __visible to arch/x86/*	2014-05-05 16:07:44 -07:00
mm	/dev/mem: Use more consistent data types	2014-11-10 15:59:21 +01:00
net	x86: bpf_jit: fix two bugs in eBPF JIT compiler	2014-10-14 13:13:14 -04:00
oprofile	percpu: Resolve ambiguities in __get_cpu_var/cpumask_var_t	2014-08-28 08:58:57 -04:00
pci	xen: features and fixes for 3.18-rc0	2014-10-11 20:29:01 -04:00
platform	uv: Replace __get_cpu_var	2014-08-26 13:45:50 -04:00
power	nosave: consolidate __nosave_{begin,end} in <asm/sections.h>	2014-10-09 22:26:04 -04:00
purgatory	arch/x86/purgatory/Makefile: try to use automatic variable in kexec purgatory makefile	2014-10-14 02:18:21 +02:00
realmode	x86/build: Supress realmode.bin is up to date message	2014-04-16 15:17:24 +02:00
syscalls	bpf: enable bpf syscall on x64 and i386	2014-09-26 15:05:14 -04:00
tools	x86/relocs: Make per_cpu_load_addr static	2014-09-24 15:17:47 +02:00
um	Merge git://git.infradead.org/users/eparis/audit	2014-10-19 16:25:56 -07:00
vdso	x86/vdso: Fix vdso2c's special_pages[] error checking	2014-09-24 09:55:38 +02:00
video
xen	Merge branch 'for-3.18-consistent-ops' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu	2014-10-15 07:48:18 +02:00
.gitignore	x86/build: Add arch/x86/purgatory/ make generated files to gitignore	2014-10-09 09:29:46 +02:00
Kbuild	kexec: create a new config option CONFIG_KEXEC_FILE for new syscall	2014-08-29 16:28:16 -07:00
Kconfig	Merge branch 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2014-10-14 02:23:55 +02:00
Kconfig.cpu	Merge branch 'x86-nuke-platforms-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2014-04-02 13:15:58 -07:00
Kconfig.debug	x86/efi: Dump the EFI page table	2014-03-04 16:17:17 +00:00
Makefile	Merge branch 'x86-build-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2014-10-13 18:17:33 +02:00
Makefile_32.cpu
Makefile.um