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	Merge remote-tracking branch 'jwb/next' into next	2011-07-22 13:16:41 +10:00
configs	Merge remote-tracking branch 'jwb/next' into next	2011-07-22 13:16:41 +10:00
include/asm	Merge branch 'next/cross-platform' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc	2011-07-26 17:12:10 -07:00
kernel	Merge branch 'next/cross-platform' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc	2011-07-26 17:12:10 -07:00
kvm	Merge branch 'kvm-updates/3.1' of git://git.kernel.org/pub/scm/virt/kvm/kvm	2011-07-24 09:07:03 -07:00
lib	Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc	2011-05-20 13:28:01 -07:00
math-emu	powerpc/85xx: Fix SPE float to integer conversion failure	2011-03-15 13:48:15 -05:00
mm	Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc	2011-07-25 22:59:39 -07:00
net	net: filter: BPF 'JIT' compiler for PPC64	2011-07-21 12:38:32 -07:00
oprofile	powerpc/oprofile: Handle events that raise an exception without overflowing	2011-05-26 13:38:57 +10:00
platforms	Merge branch 'next/cross-platform' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc	2011-07-26 17:12:10 -07:00
sysdev	Merge branch 'next/cross-platform' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc	2011-07-26 17:12:10 -07:00
xmon	powerpc: Remove call sites of MSG_ALL_BUT_SELF	2011-05-19 14:30:46 +10:00
Kconfig	Merge branch 'apei' into apei-release	2011-08-03 11:30:42 -04:00
Kconfig.debug	powerpc/pseries: Re-implement HVSI as part of hvc_vio	2011-06-29 17:48:35 +10:00
Makefile	Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc	2011-07-25 22:59:39 -07:00
relocs_check.pl	…