From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 3 May 2013 14:06:37 +0000 (-0700)
Subject: Merge tag 'for-v3.10' of git://git.infradead.org/users/cbou/linux-pstore
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=00fdffb5131125dce0702bf61e24a806ec3aed80;p=deliverable%2Flinux.git

Merge tag 'for-v3.10' of git://git.infradead.org/users/cbou/linux-pstore

Pull pstore update from Anton Vorontsov:

 - A new platform data parameter to specify ECC configuration;

 - Rounding fixup to not waste memory in ecc_blocks;

 - Restore ECC information printouts;

 - A small code cleanup: use kmemdup where appropriate.

* tag 'for-v3.10' of git://git.infradead.org/users/cbou/linux-pstore:
  pstore/ram: Restore ecc information block
  pstore/ram: Allow specifying ecc parameters in platform data
  pstore/ram: Include ecc_size when calculating ecc_block
  pstore: Replace calls to kmalloc and memcpy with kmemdup
---

00fdffb5131125dce0702bf61e24a806ec3aed80