From: Joerg Roedel <joerg.roedel@amd.com>
Date: Wed, 26 Aug 2009 10:10:19 +0000 (+0200)
Subject: x86/amd-iommu: Remove some merge helper code
X-Git-Tag: v2.6.32-rc1~727^2^2~2^2~3
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f2430bd104bec2706315e9e983a9d9f828ff9565;p=pandora-kernel.git

x86/amd-iommu: Remove some merge helper code

This patch removes some left-overs which where put into the code to
simplify merging code which also depends on changes in other trees.

Signed-off-by: Joerg Roedel <joerg.roedel@amd.com>
---

Reading git-diff-tree failed