]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'pstore' into next
authorTony Luck <tony.luck@intel.com>
Mon, 19 Aug 2013 18:58:07 +0000 (11:58 -0700)
committerTony Luck <tony.luck@intel.com>
Mon, 19 Aug 2013 18:58:07 +0000 (11:58 -0700)

Trivial merge