diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-02-09 23:41:02 (GMT) |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-02-09 23:41:02 (GMT) |
| commit | 92e2d508464b6293ad274fb606f766a458894142 (patch) | |
| tree | 39bf383364530e5cdeacb205d32d69a4b78e253d /Documentation | |
| parent | 5d96218b4a5ee0c5ff0ac87f3ba90cfa86ca0ca1 (diff) | |
| parent | d315760ffa261c15ff92699ac6f514112543d7ca (diff) | |
| download | linux-fsl-qoriq-92e2d508464b6293ad274fb606f766a458894142.tar.xz | |
Merge branch 'x86/urgent' into core/percpu
Conflicts:
arch/x86/kernel/acpi/boot.c
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/kernel-parameters.txt | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt index d8362cf..b182626 100644 --- a/Documentation/kernel-parameters.txt +++ b/Documentation/kernel-parameters.txt @@ -937,6 +937,8 @@ and is between 256 and 4096 characters. It is defined in the file intel_iommu= [DMAR] Intel IOMMU driver (DMAR) option + on + Enable intel iommu driver. off Disable intel iommu driver. igfx_off [Default Off] |