From: Rusty Russell <rusty@rustcorp.com.au>
Date: Tue, 31 Mar 2009 03:03:50 +0000 (+1030)
Subject: Merge branch 'cpumask-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v2.6.30-rc1~205^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=558f6ab9106e6be701acb0257e7171df1bbccf04;p=pandora-kernel.git

Merge branch 'cpumask-for-linus' of git://git./linux/kernel/git/tip/linux-2.6-tip

Conflicts:

	arch/x86/include/asm/topology.h
	drivers/oprofile/buffer_sync.c
(Both cases: changed in Linus' tree, removed in Ingo's).
---

558f6ab9106e6be701acb0257e7171df1bbccf04
Reading git-diff-tree failed