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	m68k/amiga: Chip RAM - Use lookup_resource()	2011-07-30 21:21:39 +02:00
apollo
atari	m68k/atari: Reserve some ST-RAM early on for device buffer use	2011-07-30 21:21:39 +02:00
bvme6000
configs
emu
fpsp040
hp300
ifpsp060
include/asm	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
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
mac
math-emu	m68k/math-emu: Remove unnecessary code	2011-07-30 21:21:40 +02:00
mm	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
mvme16x
mvme147
platform
q40
sun3
sun3x
tools/amiga
install.sh
Kconfig	Merge branch 'apei' into apei-release	2011-08-03 11:30:42 -04:00
Kconfig.debug
Kconfig.mmu	m68k/atari: Reserve some ST-RAM early on for device buffer use	2011-07-30 21:21:39 +02:00
Kconfig.nommu
Makefile
Makefile_mm
Makefile_no