1
0
Fork 0
alistair23-linux/arch/frv
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
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
lib irq_work: Add generic hardirq context callbacks 2010-10-18 19:58:50 +02:00
mb93090-mb00 mm: stack based kmap_atomic() 2010-10-26 16:52:08 -07:00
mm frv: remove unnecessary code 2011-07-29 23:41:09 -07:00
Kconfig Add Kconfig option ARCH_HAVE_NMI_SAFE_CMPXCHG 2011-08-03 11:12:37 -04:00
Kconfig.debug
Makefile frv: clean up arch/frv/Makefile 2010-08-03 14:09:45 +02:00
defconfig kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERT 2011-01-20 17:02:05 -08:00