From: Arjan van de Ven <arjan@linux.intel.com>
Date: Fri, 17 Oct 2008 16:20:26 +0000 (-0700)
Subject: Merge commit 'linus/master' into merge-linus
X-Git-Tag: v2.6.28-rc1~18^2^2~3^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=651dab4264e4ba0e563f5ff56f748127246e9065;p=pandora-kernel.git

Merge commit 'linus/master' into merge-linus

Conflicts:

	arch/x86/kvm/i8254.c
---

651dab4264e4ba0e563f5ff56f748127246e9065
Reading git-diff-tree failed