]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge branch 'pstore' into next
authorTony Luck <tony.luck@intel.com>
Mon, 16 Sep 2013 16:29:20 +0000 (09:29 -0700)
committerTony Luck <tony.luck@intel.com>
Mon, 16 Sep 2013 16:29:20 +0000 (09:29 -0700)

Trivial merge