Merge ../bleed-2.6

6fbfddcb · Greg KH · Greg Kroah-Hartman · 1a222bca · 27d1097d · 6fbfddcb
Commit 6fbfddcb authored 19 years ago by Greg KH Committed by Greg Kroah-Hartman 19 years ago
20 changed files
--- a/arch/arm/mach-versatile/core.c
+++ b/arch/arm/mach-versatile/core.c
--- a/arch/arm/mm/consistent.c
+++ b/arch/arm/mm/consistent.c
--- a/arch/arm/mm/init.c
+++ b/arch/arm/mm/init.c
--- a/arch/arm/mm/ioremap.c
+++ b/arch/arm/mm/ioremap.c
--- a/arch/arm/mm/mm-armv.c
+++ b/arch/arm/mm/mm-armv.c
--- a/arch/arm/oprofile/Makefile
+++ b/arch/arm/oprofile/Makefile
--- a/arch/arm/oprofile/common.c
+++ b/arch/arm/oprofile/common.c
--- a/arch/arm/oprofile/init.c
+++ b/arch/arm/oprofile/init.c
--- a/arch/arm/oprofile/op_arm_model.h
+++ b/arch/arm/oprofile/op_arm_model.h
--- a/arch/arm/plat-omap/sram.c
+++ b/arch/arm/plat-omap/sram.c
--- a/arch/frv/mb93090-mb00/pci-dma-nommu.c
+++ b/arch/frv/mb93090-mb00/pci-dma-nommu.c
--- a/arch/frv/mb93090-mb00/pci-dma.c
+++ b/arch/frv/mb93090-mb00/pci-dma.c
--- a/arch/frv/mm/dma-alloc.c
+++ b/arch/frv/mm/dma-alloc.c
--- a/arch/ia64/hp/common/hwsw_iommu.c
+++ b/arch/ia64/hp/common/hwsw_iommu.c
--- a/arch/ia64/hp/common/sba_iommu.c
+++ b/arch/ia64/hp/common/sba_iommu.c
--- a/arch/ia64/lib/swiotlb.c
+++ b/arch/ia64/lib/swiotlb.c
--- a/arch/ia64/sn/kernel/xpc.h
+++ b/arch/ia64/sn/kernel/xpc.h
--- a/arch/ia64/sn/pci/pci_dma.c
+++ b/arch/ia64/sn/pci/pci_dma.c
--- a/arch/mips/mm/dma-coherent.c
+++ b/arch/mips/mm/dma-coherent.c
--- a/arch/mips/mm/dma-ip27.c
+++ b/arch/mips/mm/dma-ip27.c