tree 087c5c1f514a2ffeb75c925545e584fb269bea3a
parent 0a053e8c71d666daf30da2d407147b1293923d8b
parent 38a6ed3ed8e108b662f4016a1ebf068dcf4c1ef4
author Linus Torvalds <torvalds@linux-foundation.org> 1238952205 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1238952205 -0700

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

* 'printk-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  printk: correct the behavior of printk_timed_ratelimit()
  vsprintf: unify the format decoding layer for its 3 users, cleanup
  fix regression from "vsprintf: unify the format decoding layer for its 3 users"
  vsprintf: fix bug in negative value printing
  vsprintf: unify the format decoding layer for its 3 users
  vsprintf: add binary printf
  printk: introduce printk_once()

Fix trivial conflicts (printk_once vs log_buf_kexec_setup() added near
each other) in include/linux/kernel.h.