summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-07-05 08:57:24 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-07-05 08:58:03 -0700
commite765bf84d59257d3c4f948fbce426ea3565e83ad (patch)
treee6c2fa13b21a2faf398c3c6ceba8fe5187e381d7 /scripts
parentafd6bb387323154ff6554b52d333ec6efb8efe61 (diff)
parent6887a4131da3adaab011613776d865f4bcfb5678 (diff)
downloadlinux-e765bf84d59257d3c4f948fbce426ea3565e83ad.tar.bz2
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-translate0
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