From: David Woodhouse <David.Woodhouse@intel.com>
Date: Mon, 20 Oct 2008 19:16:53 +0000 (+0100)
Subject: Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
X-Git-Tag: v2.6.28-rc1~39^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b364776ad1208a71f0c53578c84619a395412a8d;p=pandora-kernel.git

Merge branch 'master' of /linux/kernel/git/torvalds/linux-2.6

Conflicts:

	drivers/pci/intel-iommu.c
---

b364776ad1208a71f0c53578c84619a395412a8d
Reading git-diff-tree failed