Merge tag 'for-v3.8' of git://git.infradead.org/users/cbou/linux-pstore
commit75e300c8ba5864367634d946c729d8fd05c1cbc2
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 15 Dec 2012 20:51:50 +0000 (15 12:51 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 15 Dec 2012 20:51:50 +0000 (15 12:51 -0800)
tree2ccbc619f482d453d18e5162649e3c2e7162673c
parentc13e69b2f0e1e2da41a175c7e9215659842cbef9
parentebacfd1ece3bfa46296fc92c6f996cb5f7fc75e6
Merge tag 'for-v3.8' of git://git.infradead.org/users/cbou/linux-pstore

Pull pstore update from Anton Vorontsov:
 "Here are just a few fixups for the pstore subsystem, nothing special
  this time"

* tag 'for-v3.8' of git://git.infradead.org/users/cbou/linux-pstore:
  pstore/ftrace: Adjust for ftrace_ops->func prototype change
  pstore/ram: Fix bounds checks for mem_size, record_size, console_size and ftrace_size
  pstore/ram: Fix undefined usage of rounddown_pow_of_two(0)
  pstore/ram: Fixup section annotations
fs/pstore/ram.c