Merge commit 'refs/changes/16/411516/5' of ssh://git-master:12001/linux-3.10 into...
Mandar padmawar [Fri, 30 May 2014 06:28:18 +0000 (23:28 -0700)]
1  2 
fs/pstore/ram.c

diff --cc fs/pstore/ram.c
Simple merge