Merge tag 'for-v3.10' of git://git.infradead.org/users/cbou/linux-pstore
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 3 May 2013 14:06:37 +0000 (07:06 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 3 May 2013 14:06:37 +0000 (07:06 -0700)
commit00fdffb5131125dce0702bf61e24a806ec3aed80
tree1cf855601ce34630b487f8555cf7df2e96efb506
parentce857229e0c3adc211944a13a5579ef84fd7b4af
parentbd08ec33b5c23833581e5a36b2a69ccae6b39a28
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