diff options
| author | Joerg Roedel <[email protected]> | 2012-01-09 12:06:28 +0000 |
|---|---|---|
| committer | Joerg Roedel <[email protected]> | 2012-01-09 12:06:28 +0000 |
| commit | f93ea733878733f3e98475bc3e2ccf789bebcfb8 (patch) | |
| tree | ce4981e49a75d5bac7f0d2fa4ddcdcc130cf56f0 /fs/jbd/commit.c | |
| parent | Merge branches 'iommu/fixes', 'arm/omap' and 'x86/amd' into next (diff) | |
| parent | iommu: Fix compile error with !IOMMU_API (diff) | |
| download | kernel-f93ea733878733f3e98475bc3e2ccf789bebcfb8.tar.gz kernel-f93ea733878733f3e98475bc3e2ccf789bebcfb8.zip | |
Merge branches 'iommu/page-sizes' and 'iommu/group-id' into next
Conflicts:
drivers/iommu/amd_iommu.c
drivers/iommu/intel-iommu.c
include/linux/iommu.h
Diffstat (limited to 'fs/jbd/commit.c')
0 files changed, 0 insertions, 0 deletions