diff options
author | Ingo Molnar <mingo@elte.hu> | 2009-09-04 16:44:16 +0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-09-04 16:44:16 +0400 |
commit | 695a461296e5df148c99ac087b9e1cb380f4db15 (patch) | |
tree | 951893036fdc0b7bae0e17bc739ac8ffe909781d /arch/mips/pci/pci-tx4939.c | |
parent | c7084b35eb1a4d3353a501508baf9d3d82822c93 (diff) | |
parent | 2b681fafcc50fea6304ed418667c9d04282acb73 (diff) | |
download | linux-695a461296e5df148c99ac087b9e1cb380f4db15.tar.xz |
Merge branch 'amd-iommu/2.6.32' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/linux-2.6-iommu into core/iommu
Diffstat (limited to 'arch/mips/pci/pci-tx4939.c')
-rw-r--r-- | arch/mips/pci/pci-tx4939.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/mips/pci/pci-tx4939.c b/arch/mips/pci/pci-tx4939.c index 5fecf1cdc325..9ef840693baf 100644 --- a/arch/mips/pci/pci-tx4939.c +++ b/arch/mips/pci/pci-tx4939.c @@ -1,6 +1,4 @@ /* - * linux/arch/mips/pci/pci-tx4939.c - * * Based on linux/arch/mips/txx9/rbtx4939/setup.c, * and RBTX49xx patch from CELF patch archive. * |