Pull pstorev4 into release branch
Tony Luck [Wed, 16 Mar 2011 16:58:31 +0000 (09:58 -0700)]
1  2 
drivers/acpi/apei/erst.c
fs/Kconfig
include/linux/magic.h

Simple merge
diff --cc fs/Kconfig
Simple merge
Simple merge