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
..
boot	sparc32: added U-Boot build target: uImage	2011-03-16 18:19:04 -07:00
configs	defconfig reduction	2010-08-14 22:26:53 +02:00
include/asm	Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6	2011-07-29 23:35:05 -07:00
kernel	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k	2011-07-31 14:30:59 -10:00
lib	sparc: rename atomic_add_unless	2011-07-27 12:53:36 -07:00
math-emu	perf: Remove the nmi parameter from the swevent and overflow interface	2011-07-01 11:06:35 +02:00
mm	sparc64: implement get_user_pages_fast()	2011-07-25 20:57:10 -07:00
oprofile	sparc: using HZ needs an include of linux/param.h	2009-10-05 00:46:08 -07:00
prom	sparc: Remove unnecessary semicolons	2011-06-07 16:06:34 -07:00
Kconfig	Merge branch 'apei' into apei-release	2011-08-03 11:30:42 -04:00
Kconfig.debug	lib: consolidate DEBUG_STACK_USAGE option	2011-05-25 08:39:54 -07:00
Makefile	sparc32: added U-Boot build target: uImage	2011-03-16 18:19:04 -07:00