Merge branch 'pstore' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux