diff options
| author | Joerg Roedel <joerg.roedel@amd.com> | 2012-01-09 07:06:28 -0500 |
|---|---|---|
| committer | Joerg Roedel <joerg.roedel@amd.com> | 2012-01-09 07:06:28 -0500 |
| commit | f93ea733878733f3e98475bc3e2ccf789bebcfb8 (patch) | |
| tree | ce4981e49a75d5bac7f0d2fa4ddcdcc130cf56f0 /Documentation/kernel-parameters.txt | |
| parent | 00fb5430f547e411ab03385cfa548776aaac1c92 (diff) | |
| parent | 95bdaf71ccf2cb4bba0c9a3d2baea0e7916f466b (diff) | |
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 'Documentation/kernel-parameters.txt')
| -rw-r--r-- | Documentation/kernel-parameters.txt | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt index 22152ed148a5..8f540d8abec5 100644 --- a/Documentation/kernel-parameters.txt +++ b/Documentation/kernel-parameters.txt | |||
| @@ -1064,7 +1064,9 @@ bytes respectively. Such letter suffixes can also be entirely omitted. | |||
| 1064 | nomerge | 1064 | nomerge |
| 1065 | forcesac | 1065 | forcesac |
| 1066 | soft | 1066 | soft |
| 1067 | pt [x86, IA-64] | 1067 | pt [x86, IA-64] |
| 1068 | group_mf [x86, IA-64] | ||
| 1069 | |||
| 1068 | 1070 | ||
| 1069 | io7= [HW] IO7 for Marvel based alpha systems | 1071 | io7= [HW] IO7 for Marvel based alpha systems |
| 1070 | See comment before marvel_specify_io7 in | 1072 | See comment before marvel_specify_io7 in |