Pull pstorev4 into release branch

author Tony Luck <tony.luck@intel.com>

Wed, 16 Mar 2011 16:58:31 +0000 (09:58 -0700)

committer Tony Luck <tony.luck@intel.com>

Wed, 16 Mar 2011 16:58:31 +0000 (09:58 -0700)
author Tony Luck <tony.luck@intel.com>
Wed, 16 Mar 2011 16:58:31 +0000 (09:58 -0700)
committer Tony Luck <tony.luck@intel.com>
Wed, 16 Mar 2011 16:58:31 +0000 (09:58 -0700)
diff --cc drivers/acpi/apei/erst.c
Simple merge
diff --cc fs/Kconfig
Simple merge
diff --cc include/linux/magic.h
Simple merge
author	Tony Luck <tony.luck@intel.com>
	Wed, 16 Mar 2011 16:58:31 +0000 (09:58 -0700)
committer	Tony Luck <tony.luck@intel.com>
	Wed, 16 Mar 2011 16:58:31 +0000 (09:58 -0700)
		1	2
drivers/acpi/apei/erst.c	patch \|	diff1 \|	diff2 \|	blob \| history
fs/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
include/linux/magic.h	patch \|	diff1 \|	diff2 \|	blob \| history