Public Git Hosting - linux-2.6/linux-acpi-2.6/ibm-acpi-2.6.git/commit

summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(merge: c7cc773 4f5a7f4)

commit	74bf3cabc306f31ddd02f2c1b0540a6cfcacc593
author	Ingo Molnar <mingo@elte.hu>
	Tue, 2 Dec 2008 08:20:29 +0000 (2 09:20 +0100)
committer	Ingo Molnar <mingo@elte.hu>
	Tue, 2 Dec 2008 08:20:29 +0000 (2 09:20 +0100)
tree	c9f2997a7266cc5d8c5b61e964d8e014f274f5d3	tree \| snapshot (tar.gz zip)
parent	c7cc77307669336a08928ab8668bdb3f3bcc021b	commit \| diff
parent	4f5a7f40ddbae98569acbb99118a98570315579c	commit \| diff

Merge branch 'tracing/urgent' into tracing/core

Conflicts:
kernel/trace/ring_buffer.c

Linux 2.6 ibm-acpi/thinkpad-acpi driver git tree