am 3802b5d4: Merge "rootdir: add pstore"

* commit '3802b5d4c5cb14864dcdd8820e9140b81a2d7d78':
  rootdir: add pstore