From: Ingo Molnar <mingo@elte.hu>
Date: Wed, 11 Mar 2009 09:29:28 +0000 (+0100)
Subject: Merge branch 'linus' into core/percpu
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=1d8ce7bc4d05b4a5c04dc17f92fef26989fb5935;p=linux-2.6-omap-h63xx.git

Merge branch 'linus' into core/percpu

Conflicts:
	arch/x86/include/asm/fixmap_64.h
---

1d8ce7bc4d05b4a5c04dc17f92fef26989fb5935