History

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

Pull trivial tree changes from Jiri Kosina: "Patches from trivial.git that keep the world turning around. Mostly documentation and comment fixes, and a two corner-case code fixes from Alan Cox" * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: kexec, Kconfig: spell "architecture" properly mm: fix cleancache debugfs directory path blackfin: mach-common: ints-priority: remove unused function doubletalk: probe failure causes OOPS ARM: cache-l2x0.c: Make it clear that cache-l2x0 handles L310 cache controller msdos_fs.h: fix 'fields' in comment scsi: aic7xxx: fix comment ARM: l2c: fix comment ibmraid: fix writeable attribute with no store method dynamic_debug: fix comment doc: usbmon: fix spelling s/unpriviledged/unprivileged/ x86: init_mem_mapping(): use capital BIOS in comment

Linus Torvalds committed 11 years ago

Commit 29afc4e2 parents 1d9c5d7 edb0ec013 files · +17 −24Browse files

Showing the changes to include/uapi/linux (1 of 13 files). Show all

Unified · Split

include/uapi/linux/msdos_fs.h+2−2
@@ -134,7 +134,7 @@ struct fat_boot_sector { · 133 unmodified lines
134134 __u8 vol_id[4]; /* volume ID */
135135 __u8 vol_label[11]; /* volume label */
136136 __u8 fs_type[8]; /* file system type */
137− /* other fiealds are not added here */
137+ /* other fields are not added here */
138138 } fat16;
139139
140140 struct {
@@ -157,7 +157,7 @@ struct fat_boot_sector { · 16 unmodified lines
157157 __u8 vol_id[4]; /* volume ID */
158158 __u8 vol_label[11]; /* volume label */
159159 __u8 fs_type[8]; /* file system type */
160− /* other fiealds are not added here */
160+ /* other fields are not added here */
161161 } fat32;
162162 };
163163 };