Merge tag 'trace-seq-buf-3.19-v2' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 13 Dec 2014 22:04:41 +0000 (14:04 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 13 Dec 2014 22:04:41 +0000 (14:04 -0800)
commit8f4385d590d4296ec38e228d17b1d002f6031dd2
tree1be286e0a0a2ab63da0bd4f7d5d8b61ebc5bf3db
parent52bb452558a426ba265a19e6eadc66cf95613014
parent1fb8915b9876a80f43732980208b39d013f8da9d
Merge tag 'trace-seq-buf-3.19-v2' of git://git./linux/kernel/git/rostedt/linux-trace

Pull tracing fixlet from Steven Rostedt:
 "Remove unnecessary preempt_disable in printk()"

* tag 'trace-seq-buf-3.19-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace:
  printk: Do not disable preemption for accessing printk_func
kernel/printk/printk.c