diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-06-17 19:02:38 (GMT) |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-06-17 19:02:38 (GMT) |
commit | 1508124d8a4e0995362d93d82e5555a74bfc998f (patch) | |
tree | 62b36e0fa03b40e68be6941c5139e8ff7653d0b2 /Documentation/kernel-parameters.txt | |
parent | 976f8bef9cfb5246bc0e8dc781562daa79cb7aaf (diff) | |
parent | 7d132055814ef17a6c7b69f342244c410a5e000f (diff) | |
download | linux-fsl-qoriq-1508124d8a4e0995362d93d82e5555a74bfc998f.tar.xz |
Merge 3.10-rc6 into usb-next
We want the fixes in this branch as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'Documentation/kernel-parameters.txt')
-rw-r--r-- | Documentation/kernel-parameters.txt | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt index 6e3b18a..2fe6e76 100644 --- a/Documentation/kernel-parameters.txt +++ b/Documentation/kernel-parameters.txt @@ -3351,9 +3351,6 @@ bytes respectively. Such letter suffixes can also be entirely omitted. plus one apbt timer for broadcast timer. x86_mrst_timer=apbt_only | lapic_and_apbt - xd= [HW,XT] Original XT pre-IDE (RLL encoded) disks. - xd_geo= See header of drivers/block/xd.c. - xen_emul_unplug= [HW,X86,XEN] Unplug Xen emulated devices Format: [unplug0,][unplug1] |