From: David Woodhouse <David.Woodhouse@intel.com>
Date: Tue, 21 Oct 2008 18:42:20 +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
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b876d08f816527af257e13d89fb0d3b4b849223c;p=pandora-kernel.git

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

Conflicts:

	drivers/pci/dmar.c
---

b876d08f816527af257e13d89fb0d3b4b849223c
Reading git-diff-tree failed