]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'pstore' into next
authorTony Luck <tony.luck@intel.com>
Fri, 14 Jun 2013 22:55:23 +0000 (15:55 -0700)
committerTony Luck <tony.luck@intel.com>
Fri, 14 Jun 2013 22:55:23 +0000 (15:55 -0700)

Trivial merge