diff options
| author | Steven Rostedt (Red Hat) <rostedt@goodmis.org> | 2014-02-25 10:21:49 -0500 |
|---|---|---|
| committer | Steven Rostedt <rostedt@goodmis.org> | 2014-02-25 10:21:49 -0500 |
| commit | 5a071e9ce67c4df91ac47ed73d21505262a4a9c5 (patch) | |
| tree | 7458f7b911b9eeeaa78f198adbb220939271e9ea /scripts | |
| parent | 286b8d66ffe26569c4d206d7c841a35899c9bc4c (diff) | |
| parent | 61dde96f97bb5b1ed4c11caf9a857d55ad8f6e17 (diff) | |
Merge tag 'v3.10.32' into v3.10-rt
This is the 3.10.32 stable release
Conflicts:
drivers/md/raid5.c
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/mod/file2alias.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/mod/file2alias.c b/scripts/mod/file2alias.c index 45f9a3377dcd..4319a3824727 100644 --- a/scripts/mod/file2alias.c +++ b/scripts/mod/file2alias.c @@ -208,8 +208,8 @@ static void do_usb_entry(void *symval, range_lo < 0x9 ? "[%X-9" : "[%X", range_lo); sprintf(alias + strlen(alias), - range_hi > 0xA ? "a-%X]" : "%X]", - range_lo); + range_hi > 0xA ? "A-%X]" : "%X]", + range_hi); } } if (bcdDevice_initial_digits < (sizeof(bcdDevice_lo) * 2 - 1)) |