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

1  2 
fs/pstore/ram.c

diff --cc fs/pstore/ram.c
Simple merge