From: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Date: Wed, 9 Dec 2009 06:14:38 +0000 (+1100)
Subject: Merge commit 'origin/master' into next
X-Git-Tag: v2.6.33-rc1~293^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bcd6acd51f3d4d1ada201e9bc5c40a31d6d80c71;p=pandora-kernel.git

Merge commit 'origin/master' into next

Conflicts:
	include/linux/kvm.h
---

bcd6acd51f3d4d1ada201e9bc5c40a31d6d80c71
Reading git-diff-tree failed