diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-07-05 19:57:24 +0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-07-05 19:58:03 +0400 |
| commit | e765bf84d59257d3c4f948fbce426ea3565e83ad (patch) | |
| tree | e6c2fa13b21a2faf398c3c6ceba8fe5187e381d7 /scripts | |
| parent | afd6bb387323154ff6554b52d333ec6efb8efe61 (diff) | |
| parent | 6887a4131da3adaab011613776d865f4bcfb5678 (diff) | |
| download | linux-e765bf84d59257d3c4f948fbce426ea3565e83ad.tar.xz | |
Merge 3.5-rc5 into usb-next
This resolves a merge issue with the option.c USB serial driver.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'scripts')
| -rwxr-xr-x[-rw-r--r--] | scripts/gfp-translate | 0 |
1 files changed, 0 insertions, 0 deletions
diff --git a/scripts/gfp-translate b/scripts/gfp-translate index c9230e158a8f..c9230e158a8f 100644..100755 --- a/scripts/gfp-translate +++ b/scripts/gfp-translate |