Len Brown d0e323b470 Merge branch 'apei' into apei-release ... Some trivial conflicts due to other various merges adding to the end of common lists sooner than this one. arch/ia64/Kconfig arch/powerpc/Kconfig arch/x86/Kconfig lib/Kconfig lib/Makefile Signed-off-by: Len Brown <len.brown@intel.com>		2011-08-03 11:30:42 -04:00
..
appldata	[S390] mm: add ZONE_DMA to 31-bit config again	2011-05-26 09:48:25 +02:00
boot	[S390] fix s390 assembler code alignments	2011-07-24 10:48:21 +02:00
crypto	crypto: s390 - support hardware accelerated SHA-224	2011-07-04 20:06:01 +08:00
hypfs	treewide: remove extra semicolons	2011-04-10 17:01:05 +02:00
include/asm	atomic: cleanup asm-generic atomic*.h inclusion	2011-07-26 16:49:47 -07:00
kernel	atomic: use <linux/atomic.h>	2011-07-26 16:49:47 -07:00
kvm	[S390] kvm: make sigp emerg smp capable	2011-07-24 10:48:22 +02:00
lib	[S390] fix s390 assembler code alignments	2011-07-24 10:48:21 +02:00
math-emu	s390: change to new flag variable	2011-03-17 14:02:57 +01:00
mm	[S390] kvm guest address space mapping	2011-07-24 10:48:21 +02:00
oprofile	Merge branch 'master' into for-next	2011-07-11 14:15:55 +02:00
defconfig	[S390] Update default configuration	2011-01-12 09:55:24 +01:00
Kbuild	[S390] standardize Kbuild rules	2010-10-25 16:10:14 +02:00
Kconfig	Add Kconfig option ARCH_HAVE_NMI_SAFE_CMPXCHG	2011-08-03 11:12:37 -04:00
Kconfig.debug	[S390] Write protect module text and RO data	2011-03-15 17:08:23 +01:00
Makefile	[S390] remove redundant stack check option	2011-03-15 17:08:22 +01:00