Merge branch 'for-linus' of git://

Pull printk updates from Petr Mladek:

 - Store printk() messages into the main log buffer directly even in NMI
   when the lock is available. It is the best effort to print even large
   chunk of text. It is handy, for example, when all ftrace messages are
   printed during the system panic in NMI.

 - Add missing annotations to calm down compiler warnings

* 'for-linus' of git://
  printk: add __printf attributes to internal functions
  printk: Use the main logbuf in NMI when logbuf_lock is available