linux_dsm_epyc7002/arch/m68k
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
..
amiga
apollo
atari
bvme6000
configs
emu
fpsp040
hp300
ifpsp060
include/asm
kernel
lib
mac
math-emu
mm
mvme16x
mvme147
platform
q40
sun3
sun3x
tools/amiga
install.sh
Kconfig
Kconfig.debug
Kconfig.mmu
Kconfig.nommu
Makefile
Makefile_mm
Makefile_no