tree f216e244a6f88ede277a3687499dbb1762a3c37a
parent 116a9fb3ed98c19d1ee0c6c55971f5b753949393
parent 9e4144abf8a30ae221311368bbb10690ebdb4b76
author Linus Torvalds <torvalds@linux-foundation.org> 1216074463 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1216074463 -0700

Merge branch 'core/printk' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'core/printk' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86, generic: mark early_printk as asmlinkage
  printk: export console_drivers
  printk: remember the message level for multi-line output
  printk: refactor processing of line severity tokens
  printk: don't prefer unsuited consoles on registration
  printk: clean up recursion check related static variables
  namespacecheck: more kernel/printk.c fixes
  namespacecheck: fix kernel printk.c