From: David Woodhouse <David.Woodhouse@intel.com>
Date: Mon, 14 Jul 2008 22:49:04 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
X-Git-Tag: v2.6.27-rc1~1094^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=751851af7aae9b8bd5a60b3897209081fbc18b2b;p=pandora-kernel.git

Merge git://git./linux/kernel/git/torvalds/linux-2.6.git

Conflicts:

	sound/pci/Kconfig
---

751851af7aae9b8bd5a60b3897209081fbc18b2b
Reading git-diff-tree failed