aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation/x86/x86_64/boot-options.txt
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2011-03-18 10:38:53 +0100
committerIngo Molnar <mingo@elte.hu>2011-03-18 10:39:00 +0100
commit8dd8997d2c56c9f248294805e129e1fc69444380 (patch)
tree3b030a04295fc031db98746c4074c2df1ed6a19f /Documentation/x86/x86_64/boot-options.txt
parent1eda75c131ea42ec173323b6c34aeed78ae637c1 (diff)
parent016aa2ed1cc9cf704cf76d8df07751b6daa9750f (diff)
downloadkernel_samsung_smdk4412-8dd8997d2c56c9f248294805e129e1fc69444380.zip
kernel_samsung_smdk4412-8dd8997d2c56c9f248294805e129e1fc69444380.tar.gz
kernel_samsung_smdk4412-8dd8997d2c56c9f248294805e129e1fc69444380.tar.bz2
Merge branch 'linus' into x86/urgent
Merge reason: Merge upstream commits to avoid conflicts in upcoming patches. Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'Documentation/x86/x86_64/boot-options.txt')
0 files changed, 0 insertions, 0 deletions