diff options
| author | Steven Rostedt (Red Hat) <rostedt@goodmis.org> | 2014-04-24 17:31:49 -0400 |
|---|---|---|
| committer | Steven Rostedt <rostedt@goodmis.org> | 2014-04-24 17:31:49 -0400 |
| commit | ab3e9005c5d1e2a74e4c6fe2d823ef2bf9ad5420 (patch) | |
| tree | 6a888b2ddd57812be437084d31843434a7178a2a /scripts | |
| parent | 3c8ce5f0a334826f3341a8233503d4748df11a3b (diff) | |
| parent | e08e9457eeba01608645e398c7e69b2fb40e31a9 (diff) | |
Merge tag 'v3.2.56' into v3.2-rt
This is the 3.2.56 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 d1d0ae84dc8e..98ff331ba197 100644 --- a/scripts/mod/file2alias.c +++ b/scripts/mod/file2alias.c @@ -130,8 +130,8 @@ static void do_usb_entry(struct usb_device_id *id, 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(id->bcdDevice_lo) * 2 - 1)) |