git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'hwmon-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6
[pandora-kernel.git]
/
arch
/
i386
/
boot
/
bootsect.S
diff --git
a/arch/i386/boot/bootsect.S
b/arch/i386/boot/bootsect.S
index
ba9fe14
..
011b7a4
100644
(file)
--- a/
arch/i386/boot/bootsect.S
+++ b/
arch/i386/boot/bootsect.S
@@
-83,7
+83,7
@@
bugger_off_msg:
.ascii "\n"
.ascii "Remove disk and press any key to reboot . . .\r\n"
.byte 0
-
+
# Kernel attributes; used by setup