]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commit
Merge branch 'core-printk-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 5 Dec 2009 17:50:22 +0000 (09:50 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 5 Dec 2009 17:50:22 +0000 (09:50 -0800)
commitd0b093a8b5ae34ee8be1f7e0dd197fe4788fa1d5
treedeaed4192d440b6afb7470b0c36e69d9d65dd119
parent3e72b810e30cdf4655279dd767eb798ac7a8fe5e
parent5c828713358cb9df8aa174371edcbbb62203a490
Merge branch 'core-printk-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'core-printk-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  ratelimit: Make suppressed output messages more useful
  printk: Remove ratelimit.h from kernel.h
  ratelimit: Fix/allow use in atomic contexts
  ratelimit: Use per ratelimit context locking
include/linux/kernel.h
include/linux/net.h
kernel/printk.c
kernel/sysctl.c