From: Ingo Molnar <mingo@elte.hu>
Date: Fri, 18 Jul 2008 19:13:20 +0000 (+0200)
Subject: Merge branch 'linus' into core/generic-dma-coherent
X-Git-Tag: v2.6.27-rc1~3^2~1^2~6
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f6dc8ccaab6d8f63cbae1e6c73fe972b26f5376c;p=pandora-kernel.git

Merge branch 'linus' into core/generic-dma-coherent

Conflicts:

	kernel/Makefile

Signed-off-by: Ingo Molnar <mingo@elte.hu>
---

f6dc8ccaab6d8f63cbae1e6c73fe972b26f5376c
Reading git-diff-tree failed