From: Ingo Molnar <mingo@elte.hu>
Date: Tue, 2 Dec 2008 19:09:50 +0000 (+0100)
Subject: Merge branch 'linus' into cpus4096
X-Git-Tag: v2.6.29-rc1~538^2~29
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a64d31baed104be25305e9c71585d3ea4ee9a418;p=thirdparty%2Fkernel%2Flinux.git

Merge branch 'linus' into cpus4096

Conflicts:
	kernel/trace/ring_buffer.c
---

a64d31baed104be25305e9c71585d3ea4ee9a418