]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
projects / linux-2.6-omap-h63xx.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c7cc773 4f5a7f4)
Merge branch 'tracing/urgent' into tracing/core
authorIngo Molnar <mingo@elte.hu>
Tue, 2 Dec 2008 08:20:29 +0000 (09:20 +0100)
committerIngo Molnar <mingo@elte.hu>
Tue, 2 Dec 2008 08:20:29 +0000 (09:20 +0100)
Conflicts:
kernel/trace/ring_buffer.c


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.