* Steven Rostedt <rostedt@goodmis.org> wrote:

quoted text
> Ingo,
> 
> I rebased my branch against yours and removed the module patch since it 
> looks like it is no longer urgent. I moved it over to my core branch along 
> with a fix to the compile error you saw with it. I'll be pushing that later 
> this week.
> 
> These two patchs still should go into 34.
> 
> Please pull the latest tip/tracing/urgent tree, which can be found at:
> 
>   git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace.git
> tip/tracing/urgent
> 
> 
> Julia Lawall (1):
>       ring-buffer: Add missing unlock
> 
> Li Zefan (1):
>       tracing: Fix lockdep warning in global_clock()
> 
> ----
>  kernel/trace/ring_buffer.c |    8 +++++---
>  kernel/trace/trace_clock.c |    4 ++--
>  2 files changed, 7 insertions(+), 5 deletions(-)

Pulled, thanks Steve!

	Ingo
--
unsubscribe notice
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/